Fix symfony bin script

Author: gertvdb

data/bin/symfony

@@ -1,13 +1,13 @@
 #!/usr/bin/env php
 <?php
 
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <[email protected]>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// Require composer autoloader
+if (file_exists(__DIR__ . '/../../../../autoload.php')) {
+    require(__DIR__ . '/../../../../autoload.php');
+} else {
+    throw new \RuntimeException('Unable to find composer autoload file, try running composer install first.');
+}
+
 
 // project exists?
 if (file_exists('config/config.php'))
@@ -25,21 +25,6 @@ if (!isset($sf_symfony_data_dir))
     throw new \RuntimeException('Unable to find symfony libraries due to missing config $sf_symfony_data_dir');
 }
 
-if (isset($GLOBALS['_composer_autoload_path'])) {
-    define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']);
-
-    unset($GLOBALS['_composer_autoload_path']);
-} else {
-    foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
-        if (file_exists($file)) {
-            define('PHPUNIT_COMPOSER_INSTALL', $file);
-
-            break;
-        }
-    }
-
-    unset($file);
-}
 
 // set magic_quotes_runtime to off
 ini_set('magic_quotes_runtime', 'Off');
@@ -62,8 +47,6 @@ if (count($argv) <= 1)
     $argv[] = '-T';
 }
 
-require_once($sf_symfony_lib_dir.'/config/sfConfig.class.php');
-
 sfConfig::add(array(
     'sf_root_dir'         => getcwd(),
     'sf_symfony_lib_dir'  => $sf_symfony_lib_dir,

lib/vendor/phing/tasks/ext/UnzipTask.php

@@ -20,7 +20,7 @@
 
 require_once 'phing/tasks/ext/ExtractBaseTask.php';
 require_once 'phing/system/io/FileSystem.php';
-require_once 'phing/lib/Zip.php';
+require_once 'phing/lib/Zip_Archive.php';
 
 /**
  * Extracts one or several zip archive using PEAR Archive_Zip (which is presently unreleased
@@ -32,20 +32,20 @@
  * @since     2.2.0
  */
 class UnzipTask extends ExtractBaseTask {
-    
+
     protected function extractArchive(PhingFile $zipfile)
     {
         $extractParams = array('add_path' => $this->todir->getAbsolutePath());
         if(!empty($this->removepath))
         {
             $extractParams['remove_path'] = $this->removepath;
         }
-        
+
         $this->log("Extracting zip: " . $zipfile->__toString() . ' to ' . $this->todir->__toString(), PROJECT_MSG_INFO);
-        
+
     	try {
         	$zip = new Archive_Zip($zipfile->getAbsolutePath());
-        	
+
         	$extractResponse = $zip->extract($extractParams);
         	if(is_array($extractResponse)) {
         	    foreach ($extractResponse as $extractedPath) {
@@ -59,10 +59,10 @@ protected function extractArchive(PhingFile $zipfile)
             throw new BuildException($msg, $ioe, $this->getLocation());
         }
     }
-    
+
     protected function listArchiveContent(PhingFile $zipfile)
     {
         $zip = new Archive_Zip($zipfile->getAbsolutePath());
         return $zip->listContent();
     }
-}
+}

lib/vendor/phing/tasks/ext/ZipTask.php

@@ -23,7 +23,7 @@
 include_once 'phing/util/SourceFileScanner.php';
 include_once 'phing/mappers/MergeMapper.php';
 include_once 'phing/util/StringHelper.php';
-include_once 'phing/lib/Zip.php';
+include_once 'phing/lib/Zip_Archive.php';
 
 /**
  * Creates a zip archive using PEAR Archive_Zip (which is presently unreleased
@@ -35,7 +35,7 @@
  * @since     2.1.0
  */
 class ZipTask extends MatchingTask {
-    
+
     private $zipFile;
     private $baseDir;
 
@@ -73,7 +73,7 @@ public function setBasedir(PhingFile $baseDir) {
      * @throws BuildException
      */
     public function main() {
-    
+
         if ($this->zipFile === null) {
             throw new BuildException("zipfile attribute must be set!", $this->getLocation());
         }
@@ -89,7 +89,7 @@ public function main() {
         // shouldn't need to clone, since the entries in filesets
         // themselves won't be modified -- only elements will be added
         $savedFileSets = $this->filesets;
-        
+
         try {
             if ($this->baseDir !== null) {
                 if (!$this->baseDir->exists()) {
@@ -106,8 +106,8 @@ public function main() {
                 throw new BuildException("You must supply either a basedir "
                                          . "attribute or some nested filesets.",
                                          $this->getLocation());
-            }                        
-            
+            }
+
             // check if zip is out of date with respect to each
             // fileset
             $upToDate = true;
@@ -123,21 +123,21 @@ public function main() {
                     }
                 }
             }
-            
+
             if ($upToDate) {
                 $this->log("Nothing to do: " . $this->zipFile->__toString() . " is up to date.", PROJECT_MSG_INFO);
                 return;
             }
 
             $this->log("Building zip: " . $this->zipFile->__toString(), PROJECT_MSG_INFO);
-            
+
             $zip = new Archive_Zip($this->zipFile->getAbsolutePath());
-            
-            foreach($this->filesets as $fs) {                                
+
+            foreach($this->filesets as $fs) {
             	$ds = $fs->getDirectoryScanner($this->project);
             	$files = $ds->getIncludedFiles();
 
-                // FIXME 
+                // FIXME
                 // Current model is only adding directories implicitly.  This
                 // won't add any empty directories.  Perhaps modify FileSet::getFiles()
                 // to also include empty directories.  Not high priority, since non-inclusion
@@ -146,21 +146,21 @@ public function main() {
                 $filesToZip = array();
                 for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
                     $f = new PhingFile($fsBasedir, $files[$i]);
-                    $filesToZip[] = $f->getAbsolutePath();                        
+                    $filesToZip[] = $f->getAbsolutePath();
                 }
                 $zip->add($filesToZip, array('remove_path' => $fsBasedir->getCanonicalPath()));
             }
-                         
-                
+
+
         } catch (IOException $ioe) {
                 $msg = "Problem creating ZIP: " . $ioe->getMessage();
                 $this->filesets = $savedFileSets;
                 throw new BuildException($msg, $ioe, $this->getLocation());
         }
-        
+
         $this->filesets = $savedFileSets;
     }
-           
+
     /**
      * @param array $files array of filenames
      * @param PhingFile $dir
@@ -172,5 +172,5 @@ protected function archiveIsUpToDate($files, $dir) {
         $mm->setTo($this->zipFile->getAbsolutePath());
         return count($sfs->restrict($files, $dir, null, $mm)) == 0;
     }
-   
+
 }