Changeset 7777

Timestamp:

03/08/08 14:26:35 (7 months ago)

Author:

fabien

Message:

changed auto_shutdown default value to be true for all factories by default, added a load_configuration option to sfRouting, renamed cache key for routing to avoid conflicts

Files:

• branches/1.1/lib/config/sfFactoryConfigHandler.class.php (modified) (1 diff)
• branches/1.1/lib/database/sfDatabaseManager.class.php (modified) (1 diff)
• branches/1.1/lib/log/sfLogger.class.php (modified) (1 diff)
• branches/1.1/lib/routing/sfPatternRouting.class.php (modified) (4 diffs)
• branches/1.1/lib/routing/sfRouting.class.php (modified) (2 diffs)

branches/1.1/lib/config/sfFactoryConfigHandler.class.php

@@ -172 +172 @@
-
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_routing', '%s');\n  %s\n\$this->factories['routing'] = new \$class(\$this->dispatcher, \$cache, array_merge(array('auto_shutdown' => false), sfConfig::get('sf_factory_routing_parameters', %s)));", $class, $cache, var_export($parameters, true));
-          if (isset($parameters['load_configuration']) && $parameters['load_configuration'])
-          {
-            $instances[] = "  \$this->factories['routing']->loadConfiguration();\n";
-          }
-          break;
-

branches/1.1/lib/database/sfDatabaseManager.class.php

@@ -36 +36 @@
-    $this->initialize($configuration);
-
-isset($options['auto_shutdown']) &&
+!isset($options['auto_shutdown']) ||
-    {
-      register_shutdown_function(array($this, 'shutdown'));

branches/1.1/lib/log/sfLogger.class.php

@@ -50 +50 @@
-    $this->initialize($dispatcher, $options);
-
-isset($options['auto_shutdown']) &&
+!isset($options['auto_shutdown']) ||
-    {
-      register_shutdown_function(array($this, 'shutdown'));

branches/1.1/lib/routing/sfPatternRouting.class.php

@@ -63 +63 @@
-    $options['variable_content_regex']   = '[^'.implode('', array_map(create_function('$a', 'return str_replace(\'-\', \'\-\', preg_quote($a, \'#\'));'), $options['segment_separators'])).']+';
-
+    if (!isset($options['load_configuration']))
+    {
+      $options['load_configuration'] = false;
+    }
+
+    $this->setDefaultSuffix(isset($options['suffix']) ? $options['suffix'] : '');
+
-    parent::initialize($dispatcher, $cache, $options);
-
-    $this->setDefaultSuffix(isset($options['suffix']) ? $options['suffix'] : '');
-
-    if (!is_null($this->cache) && $cacheData = $this->cache->get('data'))
-    {
@@ -84 +89 @@
-    else
-    {
-
+this->options['load_configuration'] && $
-      {
-        include($config);
@@ -93 +98 @@
-      if (!is_null($this->cache))
-      {
-
+symfony.routing.
-      }
-    }
@@ -686 +691 @@
-    {
-      $this->cacheChanged = false;
-
+symfony.routing.
-    }
-  }

branches/1.1/lib/routing/sfRouting.class.php

@@ -36 +36 @@
-    $this->initialize($dispatcher, $cache, $options);
-
-isset($this->options['auto_shutdown']) &&
+!isset($this->options['auto_shutdown']) ||
-    {
-      register_shutdown_function(array($this, 'shutdown'));
@@ -84 +84 @@
-    $this->dispatcher->connect('user.change_culture', array($this, 'listenToChangeCultureEvent'));
-    $this->dispatcher->connect('request.filter_parameters', array($this, 'filterParametersEvent'));
+
+    $this->loadConfiguration();
-  }
-