restore ExtensionInstallerTest.php, modify ExtensionInstaller.php

phpbrew · Mar 24, 2014 · 14a29f8 · 14a29f8
1 parent f6b4180
commit 14a29f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/PhpBrew/ExtensionInstaller.php b/src/PhpBrew/ExtensionInstaller.php
@@ -33,15 +33,16 @@ public function installFromPecl($packageName, $version = 'stable', $configureOpt
         $downloader = new Downloader\UrlDownloader($this->logger);
         $basename = $downloader->download($url);
         $info = pathinfo($basename);
-
+        $extension_dir = getcwd() . "/$packageName";
+
         // extract
         $this->logger->info("===> Extracting $basename...");
         Utils::system("tar xf $basename");
         Utils::system("rm -rf $packageName");
         Utils::system("mv {$info['filename']} $packageName");
         Utils::system("mv package.xml $packageName");
 
-        return $this->runInstall($packageName, $packageName, $configureOptions);
+        return $this->runInstall($packageName, $extension_dir, $configureOptions);
     }
 
     public function runInstall($packageName, $dir, $configureOptions)

diff --git a/tests/PhpBrew/ExtensionInstallerTest.php b/tests/PhpBrew/ExtensionInstallerTest.php
@@ -38,7 +38,7 @@ public function testInstallPackages($packageName)
         ok($installer);
         $installedPath = $installer->installFromPecl($packageName);
         chdir('..');
-        path_ok( getcwd() . "/tmp/$installedPath" );
+        path_ok( $installedPath );
     }
 }