Changeset 28590

Timestamp:

03/17/10 20:46:54 (3 years ago)

Author:

rande

Message:

[swCombinePlugin] fix wrong type hinting

Files:

• plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php (modified) (8 diffs)

plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php

@@ -151 +151 @@
-          $this->combineAndOptimize('stylesheet', $assets);
-        }
-
+        
-        // Generate js module files
-        $javascripts = $this->view_handler->exposeMergeConfigValue('javascripts', $view);
@@ -159 +159 @@
-          $this->combineAndOptimize('javascript', $assets);
-        }
-
-      }
-    }
@@ -204 +203 @@
-    if(count($combine->getFiles()) == 0)
-    {
-
+
+
-      return;
-    }
@@ -213 +213 @@
-    );
-    
+    
-    if(is_file($path))
-    {
@@ -218 +219 @@
-      return;
-    }
-
+
-    $content = $combine->getContentsFromFiles();
-    
@@ -224 +225 @@
-    if(!$this->saveContents($path, $content))
-    {
-'
+ : '.$type
-      return;
-    }
-
+
-    // optimize file with the provided driver
-    $driver = $this->getDriver($type);
@@ -234 +235 @@
-    $results = $driver->getResults();
-    
+
-    $this->logSection('file+', sprintf(' > %s', $force_name_to ? $force_name_to : $this->view_handler->getCombinedName($type, $combined)));
-    
@@ -249 +251 @@
-   * @param swDriveBase 
-   */
-
-
+
+
+
-    $driver = $this->view_parameters->get('configuration['.$type.'][driver]', false);
-    
-    if(!class_exists($driver))
-    {
+      
-      throw new sfException('Invalid driver class : '.$driver);
-    }