Completed
Branch 1.2 (459185)
by David
04:06
created
lib/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
      *
90 90
      * @param string $sTemplate
91 91
      * @param boolean $return
92
-     * @return mixed
92
+     * @return null|string
93 93
      */
94 94
     public function display($sTemplate, $return = FALSE) {
95 95
         // Start benchmark
Please login to merge, or discard this patch.
lib/Dwoo/Adapters/ZendFramework/PluginProxy.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 	/**
29 29
 	 * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
30 30
 	 *
31
-	 * @param Zend_View_Interface $view
31
+	 * @param Dwoo_Adapters_ZendFramework_View $view
32 32
 	 */
33 33
 	public function __construct(Zend_View_Interface $view) {
34 34
 		$this->view = $view;
Please login to merge, or discard this patch.
lib/Dwoo/Data.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,6 @@
 block discarded – undo
66 66
 	 * merges the given array(s) with the current data with array_merge
67 67
 	 *
68 68
 	 * @param array $data the array to merge
69
-	 * @param array $data2 $data3 ... other arrays to merge, optional, etc.
70 69
 	 */
71 70
 	public function mergeData(array $data)
72 71
 	{
Please login to merge, or discard this patch.
lib/Dwoo/ICompiler.php 1 patch
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	/**
25 25
 	 * compiles the provided string down to php code
26 26
 	 *
27
-	 * @param string $templateStr the template to compile
27
+	 * @param string $template the template to compile
28 28
 	 * @return string a compiled php code string
29 29
 	 */
30 30
 	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template);
@@ -34,6 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @see Dwoo_Core::addPlugin
36 36
 	 * @param array $customPlugins an array of custom plugins
37
+	 * @return void
37 38
 	 */
38 39
 	public function setCustomPlugins(array $customPlugins);
39 40
 
@@ -44,6 +45,7 @@  discard block
 block discarded – undo
44 45
 	 * set it on the Dwoo object as it will be passed onto the compiler automatically
45 46
 	 *
46 47
 	 * @param Dwoo_Security_Policy $policy the security policy object
48
+	 * @return void
47 49
 	 */
48 50
 	public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
49 51
 }
Please login to merge, or discard this patch.
lib/Dwoo/Loader.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -42,6 +42,9 @@
 block discarded – undo
42 42
 
43 43
 	protected $corePluginDir;
44 44
 
45
+	/**
46
+	 * @param string $cacheDir
47
+	 */
45 48
 	public function __construct($cacheDir)
46 49
 	{
47 50
 		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';
Please login to merge, or discard this patch.
lib/Dwoo/Template/String.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@
 block discarded – undo
278 278
 	 *
279 279
 	 * @param Dwoo_Core $dwoo the dwoo instance that requests it
280 280
 	 * @param string $output the template output
281
-	 * @return mixed full path of the cached file or false upon failure
281
+	 * @return false|string full path of the cached file or false upon failure
282 282
 	 */
283 283
 	public function cache(Dwoo_Core $dwoo, $output)
284 284
 	{
Please login to merge, or discard this patch.
lib/plugins/builtin/blocks/dynamic.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -53,6 +53,10 @@
 block discarded – undo
53 53
 		return $output;
54 54
 	}
55 55
 
56
+	/**
57
+	 * @param string $dynamicId
58
+	 * @param string $compiledFile
59
+	 */
56 60
 	public static function unescape($output, $dynamicId, $compiledFile)
57 61
 	{
58 62
 		$output = preg_replace_callback('/<dwoo:dynamic_('.$dynamicId.')>(.+?)<\/dwoo:dynamic_'.$dynamicId.'>/s', array('self', 'unescapePhp'), $output, -1, $count);
Please login to merge, or discard this patch.
lib/Dwoo/Smarty/Adapter.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -183,17 +183,17 @@
 block discarded – undo
183 183
 				$phpTags = SMARTY_PHP_ALLOW;
184 184
 			}
185 185
 			switch($phpTags) {
186
-				case SMARTY_PHP_ALLOW:
187
-				case SMARTY_PHP_PASSTHRU:
188
-					$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
189
-					break;
190
-				case SMARTY_PHP_QUOTE:
191
-					$phpTags = Dwoo_Security_Policy::PHP_ENCODE;
192
-					break;
193
-				case SMARTY_PHP_REMOVE:
194
-				default:
195
-					$phpTags = Dwoo_Security_Policy::PHP_REMOVE;
196
-					break;
186
+			case SMARTY_PHP_ALLOW:
187
+			case SMARTY_PHP_PASSTHRU:
188
+				$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
189
+				break;
190
+			case SMARTY_PHP_QUOTE:
191
+				$phpTags = Dwoo_Security_Policy::PHP_ENCODE;
192
+				break;
193
+			case SMARTY_PHP_REMOVE:
194
+			default:
195
+				$phpTags = Dwoo_Security_Policy::PHP_REMOVE;
196
+				break;
197 197
 			}
198 198
 			$policy->setPhpHandling($phpTags);
199 199
 
Please login to merge, or discard this patch.
lib/plugins/builtin/blocks/strip.php 1 patch
Switch Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@
 block discarded – undo
35 35
 
36 36
 		$mode = trim($params['mode'], '"\'');
37 37
 		switch ($mode) {
38
-			case 'js':
39
-			case 'javascript':
40
-				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
38
+		case 'js':
39
+		case 'javascript':
40
+			$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
41 41
 
42
-			case 'default':
43
-			default:
42
+		case 'default':
43
+		default:
44 44
 		}
45 45
 
46 46
 		$content = preg_replace(array("/\n/","/\r/",'/(<\?(?:php)?|<%)\s*/'), array('','','$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));
Please login to merge, or discard this patch.