Changeset 8457

Timestamp:

04/14/08 20:25:57 (7 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.0/data/web/sf/sf_web_debug/css/main.css (modified) (1 diff)
• branches/dwhittle/1.1/data/web/sf/sf_web_debug/css/main.css (modified) (1 diff)
• branches/dwhittle/1.1/lib/config/sfApplicationConfiguration.class.php (modified) (2 diffs)
• branches/dwhittle/1.1/lib/helper/CacheHelper.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/helper/JavascriptHelper.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/task/i18n/sfI18nFindTask.class.php (modified) (4 diffs)
• branches/dwhittle/1.1/lib/task/project/sfProjectDisableTask.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/test/sfTestBrowser.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/util/sfBrowser.class.php (modified) (4 diffs)
• branches/dwhittle/1.1/test/functional/genericTest.php (modified) (1 diff)
• branches/dwhittle/1.1/test/functional/sfTestBrowserTest.php (modified) (3 diffs)

branches/dwhittle/1.0/data/web/sf/sf_web_debug/css/main.css

@@ -33 +33 @@
-  filter: alpha(opacity:80);
-  z-index: 10000;
+  white-space: nowrap;
-}
-

branches/dwhittle/1.1/data/web/sf/sf_web_debug/css/main.css

@@ -32 +32 @@
-  filter: alpha(opacity:80);
-  z-index: 10000;
+  white-space: nowrap;
-}
-

branches/dwhittle/1.1/lib/config/sfApplicationConfiguration.class.php

@@ -501 +501 @@
-      foreach ($pluginConfigs as $config)
-      {
-_once($config)
+ $config
-      }
-    }
@@ -509 +509 @@
-      foreach ($pluginConfigs as $config)
-      {
-_once($config)
+ $config
-      }
-    }

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

@@ -44 +44 @@
-  $data = $cache->start($name, $lifeTime);
-
- === null
+
-  {
-    sfConfig::set('symfony.cache.started', true);

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

@@ -89 +89 @@
-
-  $html_options['href'] = isset($html_options['href']) ? $html_options['href'] : '#';
-
+
+
+
+
+
+
+
+
+
-
-  return content_tag('a', $name, $html_options);

branches/dwhittle/1.1/lib/task/i18n/sfI18nFindTask.class.php

@@ -37 +37 @@
-
-    $this->detailedDescription = <<<EOF
+The [i18n:find|INFO] task finds non internationalized strings embedded in templates:
+
+  [./symfony i18n:find frontend|INFO]
+
+This task is able to find non internationalized strings in pure HTML and in PHP code:
+
+  <p>Non i18n text</p>
+  <p><?php echo 'Test' ?></p>
+
+As the task returns all strings embedded in PHP, you can have some false positive (especially
+if you use the string syntax for helper arguments).
-EOF;
-  }
@@ -48 +59 @@
-
-    // Look in templates
+    $dirs = array();
-    $moduleNames = sfFinder::type('dir')->maxdepth(0)->relative()->in(sfConfig::get('sf_app_module_dir'));
+    foreach ($moduleNames as $moduleName)
+    {
+      $dirs[] = sfConfig::get('sf_app_module_dir').'/'.$moduleName.'/templates';
+    }
+    $dirs[] = sfConfig::get('sf_app_dir').'/templates';
-
-    $strings = array();
-moduleNames as $moduleName
+dirs as $dir
-    {
-
-
+
-      foreach ($templates as $template)
-      {
+        if (!isset($strings[$template]))
+        {
+          $strings[$template] = array();
+        }
+
-        $dom = new DomDocument('1.0', sfConfig::get('sf_charset', 'UTF-8'));
-
+
+
+
+
+
+
-
-        $nodes = array($dom);
@@ -69 +95 @@
-            if (!$node->isWhitespaceInElementContent())
-            {
-
-
-
-
-
-
-
-
-
-
-
+
-            }
-          }
@@ -89 +105 @@
-            }
-          }
+          else if ('DOMProcessingInstruction' == get_class($node) && 'php' == $node->target)
+          {
+            // processing instruction node
+            $tokens = token_get_all('<?php '.$node->nodeValue);
+            foreach ($tokens as $token)
+            {
+              if (is_array($token))
+              {
+                list($id, $text) = $token;
+
+                if (T_CONSTANT_ENCAPSED_STRING === $id)
+                {
+                  $strings[$template][] = substr($text, 1, -1);
+                }
+              }
+            }
+          }
-        }
-      }
-    }
-
-moduleName => $templateString
+template => $message
-    {
-foreach ($templateStrings as $template => 
+if (!
-      {
-
-
-
-
-
+
+
+
+
+
+
+
-      }
-    }

branches/dwhittle/1.1/lib/task/project/sfProjectDisableTask.class.php

@@ -49 +49 @@
-    $env = $arguments['env'];
-
-
-!file_exists(sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.
+sfConfig::get('sf_cache_dir').'/'.
+file_exists(
-    {
-      $this->logSection('enable', sprintf('%s [%s] is currently DISABLED', $app, $env));

branches/dwhittle/1.1/lib/test/sfTestBrowser.class.php

@@ -348 +348 @@
-      }
-    }
+
+    $this->resetCurrentException();
-
-    return $this;

branches/dwhittle/1.1/lib/util/sfBrowser.class.php

@@ -161 +161 @@
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
+    // check that the previous call() hasn't returned an uncatched exception
+    $this->checkCurrentExceptionIsEmpty();
+
-    $uri = $this->fixUri($uri);
-
@@ -425 +428 @@
-
-  /**
-
+.
-   *
-   * @return sfException
@@ -432 +435 @@
-  {
-    return $this->currentException;
+  }
+
+  /**
+   * Resets the current exception.
+   */
+  public function resetCurrentException()
+  {
+    $this->currentException = null;
+  }
+
+  public function checkCurrentExceptionIsEmpty()
+  {
+    if (is_null($this->getCurrentException()) || $this->getCurrentException() instanceof sfError404Exception)
+    {
+      return;
+    }
+
+    $this->test->fail(sprintf('last request threw an uncatched exception "%s: %s"', get_class($this->getCurrentException()), $this->getCurrentException()->getMessage()));
-  }
-
@@ -681 +702 @@
-  public function shutdown()
-  {
+    $this->checkCurrentExceptionIsEmpty();
+
-    // we remove all session data
-    sfToolkit::clearDirectory(sfConfig::get('sf_test_cache_dir').'/sessions');

branches/dwhittle/1.1/test/functional/genericTest.php

@@ -114 +114 @@
-  get('/configSettingsMaxForwards/selfForward')->
-  isStatusCode(500)->
-checkResponseElement('body'
+throwsException(null
-;
-

branches/dwhittle/1.1/test/functional/sfTestBrowserTest.php

@@ -4 +4 @@
- * 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.
@@ -30 +30 @@
-  isRequestParameter('action', 'throwsException')->
-  throwsException('Exception')->
+
+  get('/exception/throwsException')->
+  isStatusCode(500)->
+  isRequestParameter('module', 'exception')->
+  isRequestParameter('action', 'throwsException')->
-  throwsException('Exception', '/Exception message/')->
+
+  get('/exception/throwsException')->
+  isStatusCode(500)->
+  isRequestParameter('module', 'exception')->
+  isRequestParameter('action', 'throwsException')->
-  throwsException('Exception', '/message/')->
+
+  get('/exception/throwsException')->
+  isStatusCode(500)->
+  isRequestParameter('module', 'exception')->
+  isRequestParameter('action', 'throwsException')->
-  throwsException(null, '!/sfException/')->
-
@@ -39 +54 @@
-  isRequestParameter('action', 'throwsSfException')->
-  throwsException('sfException')->
+
+  get('/exception/throwsSfException')->
+  isStatusCode(500)->
+  isRequestParameter('module', 'exception')->
+  isRequestParameter('action', 'throwsSfException')->
-  throwsException('sfException', 'sfException message')
-;