Changeset f3e60a4

Timestamp:

01/09/12 15:47:19 (4 months ago)

Author:

mrook

Branches:

master

Children:

2f5dd85, 0483922, 2469001, 2eb9b25

Parents:

f05d3e3

git-author:

Michiel Rook <mrook@…> (01/09/12 15:47:19)

git-committer:

Michiel Rook <mrook@…> (01/09/12 15:47:19)

Message:

Make cli/web stubs optional

File:

• classes/phing/tasks/ext/phar/PharPackageTask.php (modified) (1 diff)

classes/phing/tasks/ext/phar/PharPackageTask.php

@@ -267 +267 @@
             $phar->setStub(file_get_contents($this->stubPath));
         } else {
-            $phar->setDefaultStub(
-                $this->cliStubFile->getPathWithoutBase($this->baseDirectory),
-                $this->webStubFile->getPathWithoutBase($this->baseDirectory)
-            );
+            if (!empty($this->cliStubFile)) {
+                $cliStubFile = $this->cliStubFile->getPathWithoutBase($this->baseDirectory);
+            } else {
+                $cliStubFile = null;
+            }
+
+            if (!empty($this->webStubFile)) {
+                $webStubFile = $this->webStubFile->getPathWithoutBase($this->baseDirectory);
+            } else {
+                $webStubFile = null;
+            }
+            
+            $phar->setDefaultStub($cliStubFile, $webStubFile);
         }