- handle include(dirname(__FILE__) . "foo/bar.php")

Changed files:
    rpm-php-requires -> 1.13

diff --git a/rpm-php-requires b/rpm-php-requires
index 5a0fd12a60852ed60efdaa6124300281b8b655db..c92786c8485db53923308d7694c1173f52a21ef2 100644 (file)
--- a/rpm-php-requires
+++ b/rpm-php-requires
@@ -13,6 +13,8 @@
 
 die "You have to specify input files" if (@ARGV < 1);
 
+$pear = "/usr/share/pear";
+
 @files = ();
 %req = ();
 
@@ -23,6 +25,14 @@ while (@ARGV > 0) {
        next unless ($f =~ /\.php$/);
        open(F, "< $f") or die;
 
+       if ($f =~ /$pear/) {
+               $file_dir = $f;
+               $file_dir =~ s|.*$pear/||;
+               $file_dir =~ s|/[^/]*$||;
+       } else {
+               $file_dir = undef;
+       }
+
        while (<F>) {
                # skip comments
                next if (/^\s*(#|\/\/|\*|\/\*)/);
@@ -41,6 +51,27 @@ while (@ARGV > 0) {
                        next if ($x =~ m|^\./| or $x =~ /\$/);
                        $req{$x} = 1;
                }
+
+               next unless (defined $file_dir);
+
+               while (/(\W|^)(require|include)(_once)?
+                         \s* \(? \s* dirname \s* \( \s* __FILE__ \s* \) \s* \. \s*
+                         ("([^"]*)"|'([^']*)') 
+                         \s* \)? \s* ;/xg) {
+                       if ($5 ne "") {
+                               $x = $5;
+                       } elsif ($6 ne "") {
+                               $x = $6;
+                       } else {
+                               next;
+                       }
+
+                       next if ($x =~ /\$/);
+
+                       $x = "$file_dir/$x";
+                       $x =~ s|/+|/|g;
+                       $req{$x} = 1;
+               }
        }
 }