Changeset 8932

Timestamp:

05/13/08 23:29:55 (5 months ago)

Author:

dwhittle

Message:

dwhittle: merged changes to branch

Files:

• branches/dwhittle/1.0/lib/filter/sfExecutionFilter.class.php (modified) (1 diff)
• branches/dwhittle/1.0/test/functional/fixtures/project/apps/frontend/modules/validation/actions/actions.class.php (modified) (1 diff)
• branches/dwhittle/1.0/test/functional/fixtures/project/apps/frontend/modules/validation/validate/Index2.yml (copied) (copied from branches/1.0/test/functional/fixtures/project/apps/frontend/modules/validation/validate/Index2.yml)
• branches/dwhittle/1.0/test/functional/validationTest.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/i18n/sfMessageFormat.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/lib/filter/sfValidationExecutionFilter.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/actions/actions.class.php (modified) (1 diff)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/templates/Index2Success.php (copied) (copied from branches/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/templates/Index2Success.php)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/validate/Index2.yml (copied) (copied from branches/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/validate/Index2.yml)
• branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/validationTest.php (modified) (1 diff)
• branches/dwhittle/1.1/test/unit/yaml/sfYamlDumperTest.php (modified) (6 diffs)
• branches/dwhittle/1.1/test/unit/yaml/sfYamlParserTest.php (modified) (1 diff)

branches/dwhittle/1.0/lib/filter/sfExecutionFilter.class.php

@@ -72 +72 @@
-        $validated = true;
-
+        // the case of the first letter of the action is insignificant
-        // get the current action validation configuration
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // load validation configuration
-        // do NOT use require_once
-null !== $validateFile = sfConfigCache::getInstance()->checkConfig(sfConfig::get('sf_app_module_dir_name').'/'.$validationConfig, tru
+!is_null($validateFil
-        {
-          // create validator manager

branches/dwhittle/1.0/test/functional/fixtures/project/apps/frontend/modules/validation/actions/actions.class.php

@@ -13 +13 @@
-  public function executeIndex()
-  {
+    if (sfWebRequest::POST == $this->getRequest()->getMethod())
+    {
+      $this->getResponse()->setHttpHeader('X-Validated', 'ok');
+    }
-  }
-
-  public function handleErrorIndex()
-  {
+    $this->getResponse()->setHttpHeader('X-Validated', 'ko');
+
+    return sfView::SUCCESS;
+  }
+
+  public function executeIndex2()
+  {
+    if (sfWebRequest::POST == $this->getRequest()->getMethod())
+    {
+      $this->getResponse()->setHttpHeader('X-Validated', 'ok');
+    }
+  }
+
+  public function handleErrorIndex2()
+  {
+    $this->getResponse()->setHttpHeader('X-Validated', 'ko');
+
-    return sfView::SUCCESS;
-  }

branches/dwhittle/1.0/test/functional/validationTest.php

@@ -138 +138 @@
-  checkResponseElement('body ul[class="errors"] li[class="input4"]', 'Required')
-;
+
+// check that /validation/index and /validation/Index both uses the index.yml validation file (see #1617)
+// those tests are only relevant on machines where filesystems are case sensitive.
+$b->
+  post('/validation/index')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'index')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+$b->
+  post('/validation/Index')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'Index')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+$b->
+  post('/validation/INdex')->
+  isStatusCode(404)
+;
+
+$b->
+  post('/validation/index2')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'index2')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+$b->
+  post('/validation/Index2')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'Index2')->
+  isResponseHeader('X-Validated', 'ko')
+;

branches/dwhittle/1.1/lib/i18n/sfMessageFormat.class.php

@@ -186 +186 @@
-    $this->loadCatalogue($catalogue);
-
-    if (empty($args))
-    {
-      $args = array();
-    }
-
-    foreach ($this->messages[$catalogue] as $variant)
-    {
-foreach of the translation units
-foreach ($variant as $source => $result
+we found it, so return the target translation
+if (isset($variant[$string])
-      {
-
-
+
+
+
+
-        {
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
+
+        // found, but untranslated
+        if (empty($target))
+        {
+          return $this->postscript[0].$this->replaceArgs($string, $args).$this->postscript[1];
+        }
+        return $this->replaceArgs($target, $args);
-      }
-    }

branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/lib/filter/sfValidationExecutionFilter.class.php

@@ -108 +108 @@
-    $validated = true;
-
-
-
-
+
-    // get the current action validation configuration
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // load validation configuration
-    // do NOT use require_once
-null !== $validateFile = $this->context->getConfigCache()->checkConfig('modules/'.$validationConfig, tru
+!is_null($validateFil
-    {
-      // create validator manager

branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/fixtures/apps/frontend/modules/validation/actions/actions.class.php

@@ -13 +13 @@
-  public function executeIndex()
-  {
+    if (sfWebRequest::POST == $this->getRequest()->getMethod())
+    {
+      $this->getResponse()->setHttpHeader('X-Validated', 'ok');
+    }
-  }
-
-  public function handleErrorIndex()
-  {
+    $this->getResponse()->setHttpHeader('X-Validated', 'ko');
+
+    return sfView::SUCCESS;
+  }
+
+  public function executeIndex2()
+  {
+    if (sfWebRequest::POST == $this->getRequest()->getMethod())
+    {
+      $this->getResponse()->setHttpHeader('X-Validated', 'ok');
+    }
+  }
+
+  public function handleErrorIndex2()
+  {
+    $this->getResponse()->setHttpHeader('X-Validated', 'ko');
+
-    return sfView::SUCCESS;
-  }

branches/dwhittle/1.1/lib/plugins/sfCompat10Plugin/test/functional/validationTest.php

@@ -157 +157 @@
-$headers = $b->getResponse()->getHttpHeaders();
-$b->test()->ok(!isset($headers['X-Test']), 'Validation for GET is also triggered by HEAD requests');
+
+// check that /validation/index and /validation/Index both uses the index.yml validation file (see #1617)
+// those tests are only relevant on machines where filesystems are case sensitive.
+$b->
+  post('/validation/index')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'index')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+$b->
+  post('/validation/Index')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'Index')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+// needed to pass tests on case and non case sensitive machines
+if (!file_exists(dirname(__FILE__).'/fixtures/apps/frontend/modules/validation/templates/IndexSuccess.php'))
+{
+  $b->throwsException('sfRenderException');
+}
+
+$b->
+  post('/validation/INdex')->
+  isStatusCode(404)
+;
+
+$b->
+  post('/validation/index2')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'index2')->
+  isResponseHeader('X-Validated', 'ko')
+;
+
+if (!is_readable(dirname(__FILE__).'/fixtures/apps/frontend/modules/validation/templates/index2Success.php'))
+{
+  $b->throwsException('sfRenderException');
+}
+
+$b->
+  post('/validation/Index2')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'validation')->
+  isRequestParameter('action', 'Index2')->
+  isResponseHeader('X-Validated', 'ko')
+;
+

branches/dwhittle/1.1/test/unit/yaml/sfYamlDumperTest.php

@@ -70 +70 @@
-{ '': bar, 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
-EOF;
-sfYaml::dump($array, -10), $expected, '::
-sfYaml::dump($array, 0), $expected, '::
+$dumper->dump($array, -10), $expected, '->
+$dumper->dump($array, 0), $expected, '->
-
-$expected = <<<EOF
@@ -80 +80 @@
-
-EOF;
-sfYaml::dump($array, 1), $expected, '::
+$dumper->dump($array, 1), $expected, '->
-
-$expected = <<<EOF
@@ -94 +94 @@
-
-EOF;
-sfYaml::dump($array, 2), $expected, '::
+$dumper->dump($array, 2), $expected, '->
-
-$expected = <<<EOF
@@ -112 +112 @@
-
-EOF;
-sfYaml::dump($array, 3), $expected, '::
+$dumper->dump($array, 3), $expected, '->
-
-$expected = <<<EOF
@@ -132 +132 @@
-
-EOF;
-sfYaml::dump($array, 4), $expected, '::
-sfYaml::dump($array, 10), $expected, '::
+$dumper->dump($array, 4), $expected, '->
+$dumper->dump($array, 10), $expected, '->
-
-// objects
@@ -142 +142 @@
-}
-$a = array('foo' => new A(), 'bar' => 1);
-
-
-
-
-
-
+

branches/dwhittle/1.1/test/unit/yaml/sfYamlParserTest.php

@@ -74 +74 @@
-}
-$a = array('foo' => new A(), 'bar' => 1);
-sfYaml::load
+$parser->parse
-foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}
-bar: 1
-EOF
-::dump
+->parse