[view] fix return statement missing on ParamHolder and CacheManager (#350)

connorhu · web-flow · commit d86803d4d36d · 2024-03-21T10:17:32.000+01:00
diff --git a/lib/view/sfViewCacheManager.class.php b/lib/view/sfViewCacheManager.class.php
@@ -439,9 +439,11 @@ public function remove($internalUri, $hostName = '', $vary = '', $contextualPref
         if (strpos($cacheKey, '*')) {
             return $this->cache->removePattern($cacheKey);
         }
-        if ($this->cache->has($cacheKey)) {
-            return $this->cache->remove($cacheKey);
+        if (!$this->cache->has($cacheKey)) {
+            return true;
         }
+
+        return $this->cache->remove($cacheKey);
     }
 
     /**
diff --git a/lib/view/sfViewParameterHolder.class.php b/lib/view/sfViewParameterHolder.class.php
@@ -77,6 +77,8 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = [], $opt
 
         $this->setEscaping(isset($options['escaping_strategy']) ? $options['escaping_strategy'] : false);
         $this->setEscapingMethod(isset($options['escaping_method']) ? $options['escaping_method'] : 'ESC_SPECIALCHARS');
+
+        return true;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -439,9 +439,11 @@ public function remove($internalUri, $hostName = '', $vary = '', $contextualPref`
`439`	`439`	`if (strpos($cacheKey, '*')) {`
`440`	`440`	`return $this->cache->removePattern($cacheKey);`
`441`	`441`	`}`
`442`		`- if ($this->cache->has($cacheKey)) {`
`443`		`- return $this->cache->remove($cacheKey);`
	`442`	`+ if (!$this->cache->has($cacheKey)) {`
	`443`	`+ return true;`
`444`	`444`	`}`
	`445`	`+`
	`446`	`+ return $this->cache->remove($cacheKey);`
`445`	`447`	`}`
`446`	`448`
`447`	`449`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = [], $opt`
`77`	`77`
`78`	`78`	`$this->setEscaping(isset($options['escaping_strategy']) ? $options['escaping_strategy'] : false);`
`79`	`79`	`$this->setEscapingMethod(isset($options['escaping_method']) ? $options['escaping_method'] : 'ESC_SPECIALCHARS');`
	`80`	`+`
	`81`	`+ return true;`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`/**`