Changeset 5439

Timestamp:

10/09/07 03:45:58 (6 years ago)

Author:

xavier

Message:

replaced tabs with spaces + reindent ("stick to sf coding standards")

Files:

• plugins/sfAccessibleFormPlugin/lib/helper/AccessibleFormHelper.php (modified) (1 diff)
• plugins/sfAmazonS3FSPlugin/lib/BasesfAmazonS3.class.php (modified) (2 diffs)
• plugins/sfAmazonS3FSPlugin/lib/sfAmazonS3.class.php (modified) (1 diff)
• plugins/sfAmazonS3FSPlugin/lib/sfAmazonS3File.class.php (modified) (25 diffs)
• plugins/sfFeed2Plugin/lib/sfAtom1Feed.class.php (modified) (1 diff)
• plugins/sfFeed2Plugin/lib/sfRssFeed.class.php (modified) (1 diff)
• plugins/sfPHPUnitPlugin/data/tasks/sfPakePHPUnit.php (modified) (1 diff)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitHarness.php (modified) (1 diff)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitInitialiser.php (modified) (2 diffs)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitOutputColour.php (modified) (1 diff)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitRegistration.php (modified) (1 diff)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestPrinterTap.php (modified) (2 diffs)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestPrinterTapColour.php (modified) (2 diffs)
• plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestRunner.php (modified) (1 diff)
• plugins/sfPayloadFilterChain_TextTransformationPlugin/lib/transformer/pfcGeshiHighlightTransformer.class.php (modified) (3 diffs)
• plugins/sfPayloadFilterChain_TextTransformationPlugin/lib/transformer/pfcMimeConversionTransformer.class.php (modified) (3 diffs)
• plugins/sfPropelVersionableBehaviorPlugin/lib/sfPropelVersionableBehavior.class.php (modified) (1 diff)
• plugins/sfSimpleBlogPlugin/modules/sfSimpleBlog/templates/layout.php (modified) (1 diff)
• plugins/sfSimpleCMSPlugin/modules/sfSimpleCMS/templates/layout.php (modified) (1 diff)
• plugins/sfUJSPlugin/lib/helper/UJSHelper.php (modified) (3 diffs)
• plugins/sfUJSPlugin/modules/sfUJS/actions/actions.class.php (modified) (1 diff)
• plugins/sfUJSPlugin/modules/sfUJSTest/actions/actions.class.php (modified) (1 diff)
• plugins/sfUJSPlugin/modules/sfUJSTest/templates/indexSuccess.php (modified) (1 diff)
• plugins/sfYUIPlugin/lib/helper/YUIConnectionHelper.php (modified) (1 diff)
• plugins/sfYUIPlugin/lib/helper/YUITabviewHelper.php (modified) (2 diffs)

plugins/sfAccessibleFormPlugin/lib/helper/AccessibleFormHelper.php

@@ -1 +1 @@
-<?php
-
-function accessible_form_tag($route, $options = array())
-{
- 
+  
-  $response->addJavascript('/sfAccessibleFormPlugin/js/jquery');
-  $response->addJavascript('/sfAccessibleFormPlugin/js/cmxform');
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

plugins/sfAmazonS3FSPlugin/lib/BasesfAmazonS3.class.php

@@ -34 +34 @@
- * </code>
- * 
-   
-  
-      
+    
+ 
+     
- */
-class BasesfAmazonS3
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
-
-
-
+
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      {
-
-
-
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
+
-/**
- * Symfony Amazon S3 Object Stream Class
@@ -1033 +1049 @@
-class sfAmazonS3ObjectStream
-{
- 
- 
- 
- 
- 
- 
- 
+  
+  
+  
+  
+  
+  
+  
-
-  /**

plugins/sfAmazonS3FSPlugin/lib/sfAmazonS3.class.php

@@ -13 +13 @@
- *
- * 
-   
-  
-      
+    
+ 
+     
- */
-class sfAmazonS3 extends BasesfAmazonS3 
-{
-  
- 
+

plugins/sfAmazonS3FSPlugin/lib/sfAmazonS3File.class.php

@@ -24 +24 @@
- * 
- * 
-   
-  
-      
+    
+ 
+     
- */
-class sfAmazonS3File
-{
-  /**
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
-
-
- 
- 
- 
- 
- 
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
-  private $secretKey = '';
-
-
- 
- 
- 
- 
- 
+
+
+  
+  
+  
+  
+  
-  private $bucket = '';
-
-
- 
- 
- 
- 
- 
+
+
+  
+  
+  
+  
+  
-  private $ACL = 'private'; //private, public-read, public-read-write, authenticated-users-read
-
+
-  function __construct($filename = null, $bucket=null, $accessKeyId = null, $secretKey  = null)
-  {
-    // If params passed then setup class, otherwise throw exception
-
+
+
-      $this->setFilename($filename);
+    }
-    else
+    {
-      throw new Exception('You must instantiate sfAmazonS3File with a filename.');
-
-
+
+
+
+
-      $this->bucket = $bucket;
+    }
-    else
+    {
-      $this->bucket = sfConfig::get('app_amazon_s3_fs_default_bucket');
-
-
+
+
+
-    {
-      $this->accessKeyId = $accessKeyId;
-      $this->secretKey = $secretKey;
-    }
-
+ 
-    {
-      $this->accessKeyId = sfConfig::get('app_amazon_s3_fs_aws_access_key_id');
-      $this->secretKey = sfConfig::get('app_amazon_s3_fs_secret_access_key');
-    }
-
+
-    // If the file is not cached but is on S3 then go get it
-
-
-
+
+
+
+
-        $this->s3GetFile();
+      }
-      // else
-      //         throw new sfException('The file: \''.$filename.'\' doesn\'t exist in S3');
-    }
-  }
-
+
-  /**
-   * Instantiates and returns sfAmazonS3File object
@@ -126 +136 @@
-  {
-    static $sfAmazonS3File;
-
-( !isset($sfAmazonS3File) 
+
+ (!isset($sfAmazonS3File)
-    {
-      // Get instance
-
+
-    }
-
-    return $sfAmazonS3File;
-  }
-
+
-  /**
-   * Instantiates and returns sfAmazonS3File object
@@ -142 +152 @@
-  {
-    // Get instance
-
+
-
-    return $sfAmazonS3File;
-  }
-
+
-  //
-  // Public Functions
-  //
-
+
-  /**
-   * Add a file from the request param (put request)
@@ -161 +171 @@
-    $request = sfContext::getInstance()->getRequest();
-
-
+ 
-    {
-      $this->file_size = $request->getFileSize($param);
@@ -170 +180 @@
-    }
-    else
+    {
-      throw new Exception('Could not add file from request param: '.$param);
-
+
+
-    // Put file in s3
-    $this->s3AddFile();
-  }
-
+
-  /**
-   * Add a file from the local file system
@@ -185 +197 @@
-    throw new Exception('This function has not been written yet');
-  }
-
+
-  /**
-   * Delete file and return false if it doesn't exist
@@ -191 +203 @@
-  public function delete()
-  {
-
-
-
+
+
+
+
-        throw new Exception('Was unable to delete file: '.$this->getPath());
-
+
+
-      $this->s3DeleteObject($this->getKey());
-      
-      return true;
-    }
+
-    return false;
-  }
-
+
-  /**
-   * Does file exist in the system
@@ -210 +224 @@
-    return $this->fileExists(); // TODO: Check if file exists in S3
-  }
-
+
-  /**
-   * Get the absolute local path to the file
@@ -218 +232 @@
-    return sfConfig::get('sf_amazon_s3_fs_dir').$this->getFilename();
-  }
-
+
-  /**
-   * Get file mime type
@@ -226 +240 @@
-    return $this->file_type;
-  }
-
+
-  /**
-   * Get URL to file
@@ -234 +248 @@
-    return sfConfig::get('sf_amazon_s3_fs_web_path').$this->getFilename();
-  }
-
+
-  /**
-   * Set the filename for this file
@@ -240 +254 @@
-  public function setFilename($f)
-  {
-
+
+
-      $this->filename = '/'.$f;
+    }
-    else
+    {
-      $this->filename = $f;
-
-
+
+
+
-  /**
-   * Get the filename for this file
@@ -253 +271 @@
-    return $this->filename;
-  }
-
+
-  //
-  // Private Functions
-  //
-
+
-  /**
-   * Recursively makes dir on local machine if it doesn't already exist
@@ -264 +282 @@
-  {
-    // File exists with same name
-
+
+
-      throw new Exception("Was unable to create dir: $dir \nA file exists with the same name");
-
+}
-    // Dir already exists
-
+
+
-      return true;
+    }
-
-    // Make dir recursively
-
+
+
-      throw new Exception('Was unable to create dir: '.dirname($this->getPath()));
-
+
+
-    return true;
-  }
-
+
-  /**
-   * Does local file exists
@@ -303 +326 @@
-    return $fileName;
-  }
-
+
-  /**
-   * Get path to use on Amazon s3
@@ -311 +334 @@
-    return $this->getURL();
-  }
-
+
-  /**
-   * Get Amazon key for file
@@ -319 +342 @@
-    return sfConfig::get('sf_amazon_s3_fs_folder').$this->getFilename();
-  }
-
+
-  /**
-   * Add this file to s3
@@ -329 +352 @@
-    $sfAmazonS3->putObjectInBucket($this->bucket, $this->getKey(), $this->getFilePathS3(), $this->getPath(),$this->getType(), $this->ACL);
-  }
-
+
-  /**
-   * Create Bucket if it doesn't exists
@@ -337 +360 @@
-  private function s3CreateBucket($bucket)
-  {
-
+ 
-    {
-      $sfAmazonS3 = new sfAmazonS3($this->accessKeyId, $this->secretKey);
@@ -343 +366 @@
-    }
-  }
-
+
-  /**
-   * Does a given bucket exists?
@@ -355 +378 @@
-    return in_array($bucket, $sfAmazonS3->listBuckets());
-  }
-
+
-  /**
-   * Get file from s3, put it on local disk
@@ -364 +387 @@
-    $file_data = $sfAmazonS3->getBucketObjectAsString($this->bucket, $this->getKey());
-    $file_meta = $sfAmazonS3->getBucketObjectMetaData($this->bucket, $this->getKey());
-
+
-    $filename = $this->getPath();
-
+
-    $this->fileMakeDir(dirname($this->getPath()),0777);
-
+
-    if (!$handle = fopen($filename, 'w'))
+    {
-      throw new Exception("Cannot open file ($filename)");
+    }
-
-    // Write $somecontent to our opened file.
@@ -377 +402 @@
-      throw new Exception("Cannot write to file ($filename)");
-    }
+
-    fclose($handle);
-
-
-
+
+
-  /**
-   * Delete s3 object
@@ -392 +417 @@
-    return $sfAmazonS3->deleteBucketObject($this->bucket, $key);
-  }
-
+
-  /**
-   * Does object exist
@@ -404 +429 @@
-    // TODO: There is probably a better way to check existance then to loop through all files
-    $objects = $sfAmazonS3->listBucketKeys($this->bucket,false,false,false,1000);
-
-
+
+
+
+
+
-        return true;
+      }
+    }
+
-    return false;
-  }
-}
-?>

plugins/sfFeed2Plugin/lib/sfAtom1Feed.class.php

@@ -25 +25 @@
-  protected function initContext()
-  {
- 
- 
- 
- 
+  
+  
+  
+  
-  }
-

plugins/sfFeed2Plugin/lib/sfRssFeed.class.php

@@ -26 +26 @@
-  protected function initContext()
-  {
- 
- 
- 
- 
+  
+  
+  
+  
-  }
-

plugins/sfPHPUnitPlugin/data/tasks/sfPakePHPUnit.php

@@ -18 +18 @@
-function run_phpunit_unit($task, $args)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-function run_phpunit_functional($task, $args)
-{
- 
-
- 
-
- 
- 
-   
-   
-     
-     
-     
-       
-
-       
-       
-         
-       
-       
-       
-         
-       
-
-       
-     
-   
- 
- 
- 
-   
-   
-
-   
-   
-
-   
- 
-
- 
+  
+
+  
+
+  
+  
+    
+    
+      
+      
+      
+        
+
+        
+        
+          
+        
+        
+        
+          
+        
+
+        
+      
+    
+  
+  
+  
+    
+    
+
+    
+    
+
+    
+  
+
+  
-}
-
-function _init_phpunit()
-{
- 
- 
+  
+  
-}
-
-function _init_selenium()
-{
- 
-
- 
- 
-
- 
- 
-   
-     
-     
-     
-   
- 
-
- 
-
- 
- 
-   
-   
- 
-
- 
-
- 
- 
- 
- 
-
- 
- 
-   
- 
-
- 
-
- 
-
- 
-
- 
- 
-   
- 
-
- 
-
- 
- 
-   
-   
- 
-
- 
-
- 
+  
+
+  
+  
+
+  
+  
+    
+      
+      
+      
+    
+  
+
+  
+
+  
+  
+    
+    
+  
+
+  
+
+  
+  
+  
+  
+
+  
+  
+    
+  
+
+  
+
+  
+
+  
+
+  
+  
+    
+  
+
+  
+
+  
+  
+    
+    
+  
+
+  
+
+  
-}
-
-function _terminate_selenium($selenium_process)
-{
- 
- 
+  
+  
-}
-
-function _start_selenium($jar_path)
-{
- 
- 
-
- 
-   
-   
-   
- 
-
- 
- 
-
- 
+  
+  
+
+  
+    
+    
+    
+  
+
+  
+  
+
+  
-}
-
-function _probe_selenium($host, $port, $attempts = 5, $timeout = 1)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-function _init_symfony()
-{
- 
- 
- 
- 
-
- 
+  
+  
+  
+  
+
+  
-}
-
-function run_phpunit_all($task, $args)
-{
- 
-
- 
- 
-
- 
- 
-
- 
-
+  
+
+  
+  
+
+  
+  
+
+  
+

plugins/sfPHPUnitPlugin/lib/sfPHPUnitHarness.php

@@ -4 +4 @@
-class sfPHPUnitHarness extends sfPHPUnitRegistration
-{
- 
- 
-
- 
- 
-   
- 
+  
+  
+
+  
+  
+    
+  
-
- 
- 
-   
-   
-     
-     
-       
-       
-       
+  
+  
+    
+    
+      
+      
+        
+        
+        
-
-       
-       
-     
-     
-     
-       
-       
-     
-     
-     
-       
-     
-   
+        
+        
+      
+      
+      
+        
+        
+      
+      
+      
+        
+      
+    
-
-   
- 
-
- 
- 
-   
-   
-     
-   
-
-   
-   
-
-   
-     
-     
-     
-   
-
-   
-   
-     
-
-     
-     
-       
-     
-     
-     
-       
-     
-
-     
-       'plan'    
-       'nb_tests'  
-       'failed'  
-       'passed'  
-     
-
-     
-     
-     
-
-     
-     $initialiser->run(new sfPHPUnitTestPrinterTap());   
- 
+    
+  
+
+  
+  
+    
+    
+      
+    
+
+    
+    
+
+    
+      
+      
+      
+    
+
+    
+    
+      
+
+      
+      
+        
+      
+      
+      
+        
+      
+
+      
+        'plan'    
+        'nb_tests'  
+        'failed'  
+        'passed'  
+      
+
+      
+      
+      
+
+      
+      $initialiser->run(new sfPHPUnitTestPrinterTap());    
+  
-
-     
-     
+      
+      
-
-     
-       
-         
-         
-           
-           
-         
-         
-           
-           
-         
-         
-       
-     
+      
+        
+          
+          
+            
+            
+          
+          
+            
+            
+          
+          
+        
+      
-
-     
-     
-       
-       
-         
-       
-
-       
-       
-     
-   
+      
+      
+        
+        
+          
+        
+
+        
+        
+      
+    
-
-   
-   
-     
-     
-     
-     
-     
-       
-       
-         
-       
+    
+    
+      
+      
+      
+      
+      
+        
+        
+          
+        
-
-       
-       
-     
+        
+        
+      
-
-     
-       
-         
-         
-         
-         
-         
-         
-         
-       
-     
-   
-   
-   
-     
-     
-   
+      
+        
+          
+          
+          
+          
+          
+          
+          
+        
+      
+    
+    
+    
+      
+      
+    
-
-   
- 
+    
+  
-}

plugins/sfPHPUnitPlugin/lib/sfPHPUnitInitialiser.php

@@ -2 +2 @@
-class sfPHPUnitInitialiser
-{
- 
- 
- 
-
- 
- 
-   
-   
-
-   
-   
-   
-   
-
-   
-   
-     
-   
-
-   
-   
- 
-
- 
- 
-   
-   
-     
-   
-
-   
-     
-     
-     
-   
-
-   
-
-   
-     
-     
-   
-
+  
+  
+  
+
+  
+  
+    
+    
+
+    
+    
+    
+    
+
+    
+    
+      
+    
+
+    
+    
+  
+
+  
+  
+    
+    
+      
+    
+
+    
+      
+      
+      
+    
+
+    
+
+    
+      
+      
+    
+
-        if ($suite->testAt(0) instanceof PHPUnit_Framework_Warning &&
-            strpos($suite->testAt(0)->getMessage(), 'No tests found in class') !== FALSE)
@@ -76 +76 @@
-        
-        return $result;
- 
-
- 
- 
-   
- 
+  
+
+  
+  
+    
+  
-}

plugins/sfPHPUnitPlugin/lib/sfPHPUnitOutputColour.php

@@ -3 +3 @@
-class sfPHPUnitOutputColour
-{
- 
+  
-
- 
- 
-   
- 
-
-
+  
+  
+    
+  
+
+
-
-  function diag()

plugins/sfPHPUnitPlugin/lib/sfPHPUnitRegistration.php

@@ -3 +3 @@
-class sfPHPUnitRegistration
-{
- 
- 
- 
-
- 
- 
-   
-   
-     
-     
-       
-     
-     
-     
-       
-     
-     
-     
-       
-     
-   
- 
-
- 
- 
-   
-   
-     
-   
+  
+  
+  
+
+  
+  
+    
+    
+      
+      
+        
+      
+      
+      
+        
+      
+      
+      
+        
+      
+    
+  
+
+  
+  
+    
+    
+      
+    
-
-   
+    
-
-   
-   
-   
-     
+    
+    
+    
+      
-
-     
-     
-       
-     
-     
-     
-       
-     
-   
+      
+      
+        
+      
+      
+      
+        
+      
+    
-
-   
- 
+    
+  
-
- 
- 
-   
- 
+  
+  
+    
+  
-}

plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestPrinterTap.php

@@ -6 +6 @@
-class sfPHPUnitTestPrinterTap extends PHPUnit_Util_Printer implements PHPUnit_Framework_TestListener
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          sprintf(
-# TestSuite%s started.
-
-$suite->getName() ? sprintf(" \"%s\"", $suite->getName()) : ''
+1..%d
+
+count($suite)
-          )
-        );
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/*        $this->writeComment(
-          sprintf(
@@ -145 +144 @@
-          )
-        );*/
+      
+    if (0 === $this->failCount)
+    {
+      $this->writeSuccessBar(" Looks like everything went fine.");
+    }
+    else
+    {
+      $this->writeErrorBar(
+        sprintf(
+          ' Looks like you failed %d test%s of %d.',
+          
+          $this->failCount,
+          1 !== $this->failCount ? 's' : '',
+          $suite->testCount()
+        )
+      );
+    }
+  }
+
+  /**
+   * A test started.
+   *
+   * @param  PHPUnit_Framework_Test $test
+   * @access public
+   */
+  public function startTest(PHPUnit_Framework_Test $test)
+  {
+    $this->testNumber++;
+    $this->testSuccessful = TRUE;
+  }
+
+  /**
+   * A test ended.
+   *
+   * @param  PHPUnit_Framework_Test $test
+   * @param  float                  $time
+   * @access public
+   */
+  public function endTest(PHPUnit_Framework_Test $test, $time)
+  {
+    if ($this->testSuccessful)
+    {
+      $this->writeOk($test);
+    }
+  }
+
+  /**
+   * @param  PHPUnit_Framework_Test $test
+   * @param  string                  $prefix
+   * @param  string                  $directive
+   * @access protected
+   */
+  protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
+  {
+    $line = sprintf(
+        "%s - %s%s%s",
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                PHPUnit_Util_Test::describe($test)
-              )
-            );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestPrinterTapColour.php

@@ -9 +9 @@
-class sfPHPUnitTestPrinterTapColour extends sfPHPUnitTestPrinterTap
-{
- 
+  
-    
-    public function __construct()
-    {
- 
+  
-    }
-
@@ -24 +24 @@
-    protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
-    {
-  
-  
-  
-     
-  
-  
-  
-  
-  
-  
-  
-  
+
+
+
+          
+
+
+
+
+
+
+
+
-    }
-    
-    protected function writeOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
-    {
-
-
-
-
+
+
+
+
+
-
-       
-    
-    
-    
-  
+            
+
+
+
+
-    }
-    
-    protected function writeComment($line)
-    {
- 
-     
- 
+  
+      
+  
-    }
-    
-    protected function writeErrorBar($line)
-    {
- 
-   
- 
+  
+    
+  
-    }
-    
-    protected function writeSuccessBar($line)
-    {
- 
-   
- 
+  
+    
+  
-    }
-    
- 
- 
-   
-     
-       
+  
+  
+    
+      
+        
-
-       
-       
+        
+        
-                PHPUnit_Util_Test::describe($test)
-              )
-            );
- 
+  
-}
-

plugins/sfPHPUnitPlugin/lib/sfPHPUnitTestRunner.php

@@ -9 +9 @@
-class sfPHPUnitTestRunner extends PHPUnit_Runner_BaseTestRunner
-{
-  
-  
-  
+
+
+
-    
- 
-
-
-
-public static function run($test, array $arguments = array()
+  
+
+
+
+if ($test instanceof ReflectionClass
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-
+    if ($test instanceof PHPUnit_Framework_Test)
+    {
+      $aTestRunner = new sfPHPUnitTestRunner();
+
+      return $aTestRunner->doRun(
+        $test,
+        $arguments
+      );
+    }
+    else
+    {
+      throw new InvalidArgumentException(
+        'No test case or test suite found.'
+      );
+    }
+  }
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-
-
+
+
+
-    {
-
-
-
-
+
-    }
-
-protected function runFailed($message
+if ($this->printer === NULL
-    {
-
-
-
+
+
+
+
-    }
+
+    if ($this->printer instanceof PHPUnit_Framework_TestListener)
+    {
+      $result->addListener($this->printer);
+    }
+
+    $suite->run($result, $arguments['filter'], $arguments['group']);
+
+    $result->flushListeners();
+
+    if ($this->printer instanceof sfPHPUnitTestPrinter)
+    {
+      $this->printer->printResult($result);
+    }
+
+    $this->pause($arguments['wait']);
+
+    return $result;
+  }
+
+  protected function pause($wait)
+  {
+   return;
+  }
+  
+  protected function createTestResult()
+  {
+    return new PHPUnit_Framework_TestResult();
+  }
+  
+  public function testStarted($testName)
+  {
+  }
+
+  public function testEnded($testName)
+  {
+  }
+  
+  public function testFailed($status, PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e)
+  {
+  }
+
+  protected function runFailed($message)
+  {
+    //self::printVersionString();
+    //self::write($message);
+    //exit(self::FAILURE_EXIT);
+  }
-}

plugins/sfPayloadFilterChain_TextTransformationPlugin/lib/transformer/pfcGeshiHighlightTransformer.class.php

@@ -17 +17 @@
-class pfcGeshiHighlightTransformer extends pfcAbstractTransformer
-{
-
-  /** 
-   * Highlights code in-beetwen "pre" tags.
@@ -38 +37 @@
-    if ($nb_matches > 0)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        {
-// instanciate and configure GeSHi
-  $geshi = new GeSHi(trim($matches[5][$i]), $matches[1][$i]);
+$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
+}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-    }
-    
@@ -80 +80 @@
-    $highlight_lines = array();
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
-
- 
+  
-  }
-}
-

plugins/sfPayloadFilterChain_TextTransformationPlugin/lib/transformer/pfcMimeConversionTransformer.class.php

@@ -11 +11 @@
-class pfcMimeConversionTransformer extends pfcAbstractTransformer
-{
-
-  /**
-   * Transforms text.
@@ -55 +54 @@
-    foreach($list as $l)
-    {
- 
+  
-    }
-
@@ -61 +60 @@
-  }
-}
-?>

plugins/sfPropelVersionableBehaviorPlugin/lib/sfPropelVersionableBehavior.class.php

@@ -176 +176 @@
-  public function postSave(BaseObject $resource)
-  {
- 
+    
-    {
-      $version = new ResourceVersion();

plugins/sfSimpleBlogPlugin/modules/sfSimpleBlog/templates/layout.php

@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</html>

plugins/sfSimpleCMSPlugin/modules/sfSimpleCMS/templates/layout.php

@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </div>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    </div>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    <?php endif; ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-</html>

plugins/sfUJSPlugin/lib/helper/UJSHelper.php

@@ -145 +145 @@
-function UJS_change_attributes($selector, $html_options = array())
-{
- 
+  
-}
-
@@ -183 +183 @@
-function UJS_change_style($selector, $css_options = array())
-{
- 
+  
-}
-
@@ -547 +547 @@
-  if ($UJS = $response->getParameter('script', false, 'symfony/view/UJS'))
-  {
-
-
-
+
+
+
+
-      // JavaScript code is in another file
-      use_helper('PJS');

plugins/sfUJSPlugin/modules/sfUJS/actions/actions.class.php

@@ -4 +4 @@
-class sfUJSActions extends sfActions
-{
- 
- 
-   
-   
-   
-   
-   
-
-   
- 
+  
+  
+    
+    
+    
+    
+    
+
+    
+  
-}

plugins/sfUJSPlugin/modules/sfUJSTest/actions/actions.class.php

@@ -4 +4 @@
-class sfUJSTestActions extends sfActions
-{
- 
- 
- 
- 
+  
+  
+  
+  
-}

plugins/sfUJSPlugin/modules/sfUJSTest/templates/indexSuccess.php

@@ -60 +60 @@
-  test("Basic unobtrusive scripting", function() {
-    expect(2);
- 
- 
- 
+  
+  
+  
-
-  test("Changing DOM element attributes and style", function() {
-    expect(11);
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
-  });
-  
-  test("Placeholder, replacer and writer", function() {
-    expect(11);
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
-  
-  runTest();

plugins/sfYUIPlugin/lib/helper/YUIConnectionHelper.php

@@ -207 +207 @@
- * @see link_to_function()
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

plugins/sfYUIPlugin/lib/helper/YUITabviewHelper.php

@@ -67 +67 @@
-
-  $js = "var " . $element . "_tabView = new YAHOO.widget.TabView('" . $element . "', { ";
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-  echo javascript_tag($js) . "\n" . $content;
@@ -157 +158 @@
-    {
-      $tab_attributes[] = "dataSrc: '" . $tab['dataSrc'] . "'";
+
-      if (isset($tab['cacheData']))
-      {