Changeset 10995

Timestamp:

08/20/08 10:59:54 (3 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.1/lib/config/config/settings.yml (modified) (1 diff)
• branches/dwhittle/1.1/lib/helper/FormHelper.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/task/generator/skeleton/app/app/config/settings.yml (modified) (1 diff)
• branches/dwhittle/1.1/lib/widget/sfWidget.class.php (modified) (1 diff)
• branches/dwhittle/1.1/test/unit/widget/sfWidgetTest.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/action/sfAction.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/config/config/settings.yml (modified) (3 diffs)
• branches/dwhittle/1.2/lib/config/sfGeneratorConfigHandler.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/debug/sfWebDebug.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/helper/FormHelper.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/helper/ObjectHelper.php (modified) (3 diffs)
• branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/config/config.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/lib/vendor/phpmailer/language/phpmailer.lang-de.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/test/functional/fillInFilterTest.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/task/generator/skeleton/app/app/config/settings.yml (modified) (2 diffs)
• branches/dwhittle/1.2/lib/view/sfPHPView.class.php (modified) (1 diff)
• branches/dwhittle/1.2/lib/widget/sfWidget.class.php (modified) (1 diff)
• branches/dwhittle/1.2/test/other/fixtures/propel/databases.yml (modified) (1 diff)
• branches/dwhittle/1.2/test/other/fixtures/propel/propel.ini (modified) (3 diffs)
• branches/dwhittle/1.2/test/other/tasksTest.php (modified) (7 diffs)
• branches/dwhittle/1.2/test/unit/widget/sfWidgetTest.php (modified) (1 diff)

branches/dwhittle/1.1/lib/config/config/settings.yml

@@ -19 +19 @@
-    check_symfony_version:  off       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
-    compressed:             off       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
-data_dir/web/errors
+lib_dir/exception/data
-
-    # Form security secret (CSRF protection)

branches/dwhittle/1.1/lib/helper/FormHelper.php

@@ -745 +745 @@
-  // register our javascripts and stylesheets
-  $langFile = sfConfig::get('sf_calendar_web_dir').'/lang/calendar-'.$culture;
-data_dir').'
+lib_dir').'/../data
-     (!is_readable(sfConfig::get('sf_web_dir').'/'.$langFile.'.js')))
-  {
-   $langFile = sfConfig::get('sf_calendar_web_dir').'/lang/calendar-'.substr($culture,0,2);
-data_dir').'
+lib_dir').'/../data
-      (!is_readable(sfConfig::get('sf_web_dir').'/'.$langFile.'.js')))
-   {

branches/dwhittle/1.1/lib/task/generator/skeleton/app/app/config/settings.yml

@@ -48 +48 @@
-    check_symfony_version:  off       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
-    compressed:             off       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
-data_dir/web/arrors/unavailable.php page
+lib_dir/exception/data/unavailable.php
-
-    # Form security secret (CSRF protection)

branches/dwhittle/1.1/lib/widget/sfWidget.class.php

@@ -276 +276 @@
-    }
-
-sprintf('></%s>', $tag
+('input' != $tag ? sprintf('></%s>', $tag) : '>'
-  }
-

branches/dwhittle/1.1/test/unit/widget/sfWidgetTest.php

@@ -159 +159 @@
-$t->is(sfWidget::isXhtml(), true, '::isXhtml() return true if the widget must returns XHTML tags');
-sfWidget::setXhtml(false);
-</input>', '::setXhtml() changes 
+', '::setXhtml() changes

branches/dwhittle/1.2/lib/action/sfAction.class.php

@@ -345 +345 @@
-
-  /**
+   * Retrieves the default view to be executed when a given request is not served by this action.
+   *
+   * @return string A string containing the view name associated with this action
+   */
+  public function getDefaultView()
+  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
+    return sfView::INPUT;
+  }
+
+  /**
+   * Retrieves the request methods on which this action will process validation and execution.
+   *
+   * @return int One of the following values:
+   *
+   * - sfRequest::GET
+   * - sfRequest::POST
+   * - sfRequest::PUT
+   * - sfRequest::DELETE
+   * - sfRequest::HEAD
+   * - sfRequest::NONE
+   *
+   * @see sfRequest
+   */
+  public function getRequestMethods()
+  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
+    return sfRequest::GET
+           | sfRequest::POST
+           | sfRequest::PUT
+           | sfRequest::DELETE
+           | sfRequest::HEAD
+           | sfRequest::NONE;
+  }
+
+  /**
+   * Executes any post-validation error application logic.
+   *
+   * @return string A string containing the view name associated with this action
+   */
+  public function handleError()
+  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
+    return sfView::ERROR;
+  }
+
+  /**
+   * Validates manually files and parameters.
+   *
+   * @return bool true, if validation completes successfully, otherwise false.
+   */
+  public function validate()
+  {
+    if (!sfConfig::get('sf_compat_10'))
+    {
+      throw new sfConfigurationException('You must set "compat_10" to true if you want to use this method which is deprecated.');
+    }
+
+    return true;
+  }
+
+  /**
-   * Returns the security configuration for this module.
-   *

branches/dwhittle/1.2/lib/config/config/settings.yml

@@ -19 +19 @@
-    check_symfony_version:  off       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
-    compressed:             off       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
-data_dir/web/errors
+lib_dir/exception/data
-
-    # Form security secret (CSRF protection)
@@ -31 +31 @@
-    relative_url_root:      ~         # Default URL prefix. Use this when your symfony project is installed in a sub directory of the apache document root.
-    no_script_name:         off       # Enable the front controller name in generated URLs
+
+    # Validation settings, used for error generation by the Validation helper
+    validation_error_prefix:    ' ↓ '
+    validation_error_suffix:    '  ↓'
+    validation_error_class:     form_error
+    validation_error_id_prefix: error_for_
-
-    # Cache settings
@@ -68 +74 @@
-    # i18n
-    default_culture:        en        # Default user culture
+
+    # enable 1.0 compatibility
+    compat_10:              off

branches/dwhittle/1.2/lib/config/sfGeneratorConfigHandler.class.php

@@ -80 +80 @@
-  static public function getContent(sfGeneratorManager $generatorManager, $class, $parameters)
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-

branches/dwhittle/1.2/lib/debug/sfWebDebug.class.php

@@ -179 +179 @@
-
-        // sql queries log
-execute(?:Query|Update).+?\:\s+(.+)$
+\b(SELECT|INSERT|UPDATE|DELETE)\b
-        {
-          $sqlLogs[] .= $match[1];

branches/dwhittle/1.2/lib/helper/FormHelper.php

@@ -743 +743 @@
-  // register our javascripts and stylesheets
-  $langFile = sfConfig::get('sf_calendar_web_dir').'/lang/calendar-'.$culture;
-data_dir').'
+lib_dir').'/../data
-     (!is_readable(sfConfig::get('sf_web_dir').'/'.$langFile.'.js')))
-  {
-   $langFile = sfConfig::get('sf_calendar_web_dir').'/lang/calendar-'.substr($culture,0,2);
-data_dir').'
+lib_dir').'/../data
-      (!is_readable(sfConfig::get('sf_web_dir').'/'.$langFile.'.js')))
-   {

branches/dwhittle/1.2/lib/helper/ObjectHelper.php

@@ -73 +73 @@
-  {
-    // text method exists?
-array($option, $text_method)
+$option, $text_method
-    {
-      throw new sfViewException(sprintf('Method "%s" doesn\'t exist for object of class "%s".', $text_method, _get_class_decorated($option)));
@@ -168 +168 @@
-        foreach (array($text_method, '__toString', 'toString', $key_method) as $method)
-        {
-array($tmp_object, $method)
+$tmp_object, $method
-          {
-            $methodToCall = $method;
@@ -298 +298 @@
-
-  // method exists?
-array($object, $method[0])
+$object, $method[0]
-  {
-    throw new sfViewException(sprintf('Method "%s" doesn\'t exist for object of class "%s".', $method[0], _get_class_decorated($object)));

branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/config/config.php

@@ +1 @@
+<?php
+
+if (sfConfig::get('sf_compat_10'))
+{
+  if (!class_exists('sfCompatAutoload', false))
+  {
+    class sfCompatAutoload extends sfSimpleAutoload
+    {
+    }
+
+    // autoload classes
+    $autoload = sfCompatAutoload::getInstance(sfConfig::get('sf_app_cache_dir').'/sf_compat_autoloader.txt');
+    $autoload->addDirectory(dirname(__FILE__).'/../lib');
+    $autoload->register();
+  }
+
+  // register config handler for validate/*.yml files
+  sfProjectConfiguration::getActive()->getConfigCache()->registerConfigHandler('modules/*/validate/*.yml', 'sfValidatorConfigHandler');
+
+  // register config handler for config/mailer.yml files
+  sfProjectConfiguration::getActive()->getConfigCache()->registerConfigHandler('modules/*/config/mailer.yml', 'sfDefineEnvironmentConfigHandler', array('prefix' => 'sf_mailer_', 'module' => 'yes'));
+
+  // register request compat methods
+  if ($this instanceof sfConfigCache)
+  {
+    // here if we are included from an admin generator module (for 1.0)
+    sfProjectConfiguration::getActive()->getEventDispatcher()->connect('request.method_not_found', array('sfRequestCompat10', 'call'));
+  }
+  else
+  {
+    $this->dispatcher->connect('request.method_not_found', array('sfRequestCompat10', 'call'));
+  }
+
+  // register the validation execution filter
+  sfConfig::set('sf_execution_filter', array('sfValidationExecutionFilter', array()));
+}

branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/lib/vendor/phpmailer/language/phpmailer.lang-de.php

@@ +1 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * German Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"] = 'Bitte geben Sie mindestens eine ' .
+                                     'Empf&auml;nger Emailadresse an.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailer wird nicht unterst&uuml;tzt.';
+$PHPMAILER_LANG["execute"] = 'Konnte folgenden Befehl nicht ausf&uuml;hren: ';
+$PHPMAILER_LANG["instantiate"] = 'Mail Funktion konnte nicht initialisiert werden.';
+$PHPMAILER_LANG["authenticate"] = 'SMTP Fehler: Authentifizierung fehlgeschlagen.';
+$PHPMAILER_LANG["from_failed"] = 'Die folgende Absenderadresse ist nicht korrekt: ';
+$PHPMAILER_LANG["recipients_failed"] = 'SMTP Fehler: Die folgenden ' .
+                                       'Empf&auml;nger sind nicht korrekt: ';
+$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Fehler: Daten werden nicht akzeptiert.';
+$PHPMAILER_LANG["connect_host"] = 'SMTP Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.';
+$PHPMAILER_LANG["file_access"] = 'Zugriff auf folgende Datei fehlgeschlagen: ';
+$PHPMAILER_LANG["file_open"] = 'Datei Fehler: konnte folgende Datei nicht &ouml;ffnen: ';
+$PHPMAILER_LANG["encoding"] = 'Unbekanntes Encoding-Format: ';

branches/dwhittle/1.2/lib/plugins/sfCompat10Plugin/test/functional/fillInFilterTest.php

@@ -32 +32 @@
-  checkResponseElement('input[name="first_name"][value="fabien"]')
-;
-

branches/dwhittle/1.2/lib/task/generator/skeleton/app/app/config/settings.yml

@@ -49 +49 @@
-#    check_symfony_version:  off       # Enable check of symfony version for every request. Set to on to have symfony clear the cache automatically when the framework is upgraded. Set to off if you always clear the cache after an upgrade.
-#    compressed:             off       # Enable PHP response compression. Set to on to compress the outgoing HTML via the PHP handler.
-data_dir/web/errors
+lib_dir/exception/data
-#
-#    # Routing settings
-#    relative_url_root:                # Default URL prefix. Use this when your symfony project is installed in a sub directory of the apache document root.
-#    no_script_name:         off       # Enable the front controller name in generated URLs
+#
+#    # Validation settings, used for error generation by the Validation helper
+#    validation_error_prefix:    ' ↓ '
+#    validation_error_suffix:    '  ↓'
+#    validation_error_class:     form_error
+#    validation_error_id_prefix: error_for_
-#
-#    # Cache settings
@@ -91 +97 @@
-#    # i18n
-#    default_culture:        en        # Default user culture
+#
+#    # enable 1.0 compatibility
+#    compat_10:              off

branches/dwhittle/1.2/lib/view/sfPHPView.class.php

@@ -43 +43 @@
-
-    $helpers = array_unique(array_merge(array('Helper', 'Url', 'Asset', 'Tag', 'Escaping'), sfConfig::get('sf_standard_helpers')));
+
+    // remove default Form helper if compat_10 is false
+    if (!sfConfig::get('sf_compat_10') && false !== $i = array_search('Form', $helpers))
+    {
+      unset($helpers[$i]);
+    }
-
-    sfLoader::loadHelpers($helpers);

branches/dwhittle/1.2/lib/widget/sfWidget.class.php

@@ -276 +276 @@
-    }
-
-sprintf('></%s>', $tag
+('input' != $tag ? sprintf('></%s>', $tag) : '>'
-  }
-

branches/dwhittle/1.2/test/other/fixtures/propel/databases.yml

@@ -3 +3 @@
-    class:      sfPropelDatabase
-    param:
-
-
+

branches/dwhittle/1.2/test/other/fixtures/propel/propel.ini

@@ -2 +2 @@
-propel.project             = project
-propel.database            = sqlite
-//.
-//.
+%SF_DATA_DIR%
+%SF_DATA_DIR%
-
-propel.addGenericAccessors = true
@@ -13 +13 @@
-; directories
-propel.home                    = .
-/tmp
+%SF_ROOT_DIR%
-propel.schema.dir              = ${propel.output.dir}/config
-propel.conf.dir                = ${propel.output.dir}/config
@@ -38 +38 @@
-propel.builder.nodepeerstub.class      = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder
-
-fals
-fals
+tru
+tru
-propel.packageObjectModel = true
-

branches/dwhittle/1.2/test/other/tasksTest.php

@@ -7 +7 @@
-define('DS', DIRECTORY_SEPARATOR);
-
-ymfony_cmd
+f_test_project
-{
-  public $php_cli = null;
@@ -18 +18 @@
-    $this->t = $t;
-
-IRECTORY_SEPARATOR.'symfony_cmd
+S.'sf_test_project
-
-    if (is_dir($this->tmp_dir))
@@ -49 +49 @@
-  public function execute_command($cmd, $awaited_return=0)
-  {
+    chdir($this->tmp_dir);
-    $symfony = file_exists('symfony') ? 'symfony' : dirname(__FILE__).'/../../data/bin/symfony';
-
-    ob_start();
--d html_errors=off -d open_basedir= -q 
+
-    $content = ob_get_clean();
-    $this->t->cmp_ok($return, '==', $awaited_return, sprintf('"symfony %s" returns awaited value (%d)', $cmd, $awaited_return));
@@ -65 +66 @@
-}
-
-$t = new lime_test(33, new lime_output_color());
-
-if (!extension_loaded('SQLite'))
-{
@@ -74 +73 @@
-}
-
-
+
+
-$c->initialize($t);
-
@@ -94 +94 @@
-copy(dirname(__FILE__).'/fixtures/propel/propel.ini', $c->tmp_dir.DS.'config'.DS.'propel.ini');
-
+// 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');
@@ -102 +105 @@
-
-$content = $c->execute_command('propel:build-form');
-
+base'.DS.'
-
-$c->execute_command('propel:insert-sql');
-
-
-
+
-
-$content = $c->execute_command('propel:generate-crud --generate-in-cache frontend articleInitCrud Article');

branches/dwhittle/1.2/test/unit/widget/sfWidgetTest.php

@@ -159 +159 @@
-$t->is(sfWidget::isXhtml(), true, '::isXhtml() return true if the widget must returns XHTML tags');
-sfWidget::setXhtml(false);
-</input>
+