svn: /pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/ PEAR2SVN.php

saltybeagle                              Tue, 27 Jul 2010 20:42:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=301622

Log:
Readability

Changed paths:
    U   pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php

Modified: pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php
===================================================================
--- pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php	2010-07-27 19:28:10 UTC (rev 301621)
+++ pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php	2010-07-27 20:42:04 UTC (rev 301622)
@@ -115,29 +115,21 @@
      */
     function scanFiles($packagepath)
     {
-        $this->pxml->setBaseInstallDirs(array(
-            'src'     => implode('/', $packagepath),
+        $base_install_dirs = array(
+            'src'           => implode('/', $packagepath),
             'customrole'    => '/',
             'customtask'    => '/',
             'customcommand' => '/',
-            'data'    => '/',
-            'doc'     => '/',
-            'tests'   => '/',
-            'scripts' => '/',
-            'www'     => '/',
-        ));
-        $this->pxml_compatible->setBaseInstallDirs(array(
-            'src'     => implode('/', $packagepath),
-            'customrole'    => '/',
-            'customtask'    => '/',
-            'customcommand' => '/',
-            'data'    => '/',
-            'doc'     => '/',
-            'tests'   => '/',
-            'scripts' => '/',
-            'www'     => '/',
-        ));
+            'data'          => '/',
+            'doc'           => '/',
+            'tests'         => '/',
+            'scripts'       => '/',
+            'www'           => '/',
+        );

+        $this->pxml->setBaseInstallDirs($base_install_dirs);
+        $this->pxml_compatible->setBaseInstallDirs($base_install_dirs);
+
         $rolemap = array(
             'src'           => 'php',
             'data'          => 'data',
@@ -163,9 +155,10 @@
                     if ($curpath && $curpath[0] === DIRECTORY_SEPARATOR) {
                         $curpath = substr($curpath, 1);
                     }
+
                     $curpath = $dir . '/' . $curpath;
-                    $curpath = str_replace('\\', '/', $curpath);
-                    $curpath = str_replace('//', '/', $curpath);
+                    $curpath = str_replace(array('\\', '//'), '/', $curpath);
+
                     $this->pxml->files[$curpath] =
                         array(
                             'attribs' => array('role' => $role)