Fixes #101 to get home directory on other OSs. (#102)

typhonius · Oct 20, 2020 · 9dbeeeb · 9dbeeeb
1 parent a301ebd
commit 9dbeeeb
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 128 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,8 @@
         "guzzlehttp/guzzle": "^6.3",
         "php": ">=7.3",
         "league/oauth2-client": "^2.4",
-        "symfony/cache": "^4|^5"
+        "symfony/cache": "^4|^5",
+        "webmozart/path-util": "^2.3"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Connector/Connector.php b/src/Connector/Connector.php
@@ -9,6 +9,7 @@
 use Psr\Http\Message\RequestInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Contracts\Cache\ItemInterface;
+use Webmozart\PathUtil\Path;
 
 /**
  * Class Connector
@@ -66,7 +67,7 @@ public function __construct(array $config)
     public function createRequest($verb, $path)
     {
         if (!isset($this->accessToken) || $this->accessToken->hasExpired()) {
-            $directory = sprintf('%s%s%s', posix_getpwuid(getmyuid())['dir'], \DIRECTORY_SEPARATOR, '.acquia-php-sdk-v2');
+            $directory = sprintf('%s%s%s', Path::getHomeDirectory(), \DIRECTORY_SEPARATOR, '.acquia-php-sdk-v2');
             $cache = new FilesystemAdapter('cache', 0, $directory);
             $accessToken = $cache->get('cloudapi-token', function (ItemInterface $item) {
                 $item->expiresAfter(300);

diff --git a/tests/Endpoints/ConnectorTest.php b/tests/Endpoints/ConnectorTest.php
@@ -15,6 +15,7 @@
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Request;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Webmozart\PathUtil\Path;
 
 class ConnectorTest extends CloudApiTestCase
 {
@@ -33,7 +34,7 @@ public function setUp()
         $this->connector = new Connector($config);
 
         // Clear the cache to make sure we get fresh results during testing.
-        $directory = sprintf('%s%s%s', posix_getpwuid(getmyuid())['dir'], \DIRECTORY_SEPARATOR, '.acquia-php-sdk-v2');
+        $directory = sprintf('%s%s%s', Path::getHomeDirectory(), \DIRECTORY_SEPARATOR, '.acquia-php-sdk-v2');
         $this->cache = new FilesystemAdapter('cache', 0, $directory);
         $this->cache->deleteItem('cloudapi-token');
     }