Removes extra slashes from paths and includes.

typhonius · Jan 23, 2018 · c666278 · c666278
1 parent 4a82d95
commit c666278
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/bin/acquiacli-robo.php b/bin/acquiacli-robo.php
@@ -15,7 +15,7 @@
         $root = dirname(__DIR__);
         require_once dirname(__DIR__) . '/vendor/autoload.php';
     } elseif (file_exists(dirname(__DIR__) . '/../../autoload.php')) {
-        $root = dirname(__DIR__) . '/../../../';
+        $root = dirname(__DIR__) . '/../../..';
         require_once dirname(__DIR__) . '/../../autoload.php';
     } else {
         $root = __DIR__;
@@ -28,18 +28,19 @@
 $processor = new ConfigProcessor();
 
 $globalConfig = getenv('HOME') . '/.acquiacli/acquiacli.yml';
+$projectConfig = $root . '/acquiacli.yml';
 $paths = [
     dirname(__DIR__) . '/default.acquiacli.yml',
     $globalConfig,
-    $root . '/acquiacli.yml',
+    $projectConfig,
 ];
 
 foreach ($paths as $path) {
     $processor->extend($loader->load($path));
 }
 
 $config->import($processor->export());
-$config->set('config.project', $root . '/acquiacli.yml');
+$config->set('config.project', $projectConfig);
 $config->set('config.global', $globalConfig);
 
 $input = new ArgvInput($argv);

diff --git a/src/AcquiaCli.php b/src/AcquiaCli.php
@@ -6,7 +6,7 @@
 use Robo\Config\Config;
 use Robo\Common\ConfigAwareTrait;
 use Robo\Runner as RoboRunner;
-use \Robo\Application;
+use Robo\Application;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

diff --git a/src/Commands/AcquiaCommand.php b/src/Commands/AcquiaCommand.php
@@ -23,9 +23,10 @@ abstract class AcquiaCommand extends Tasks
     /** @var \AcquiaCloudApi\CloudApi\Client $cloudapi */
     protected $cloudapi;
 
-    /** Additional configuration */
+    /** Additional configuration. */
     protected $extraConfig;
 
+    /** Regex for a valid UUID string. */
     const UUIDV4 = '/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i';
 
     const TASKFAILED = 'failed';

diff --git a/src/Commands/CloudflareCommand.php b/src/Commands/CloudflareCommand.php
@@ -2,8 +2,8 @@
 
 namespace AcquiaCli\Commands;
 
-use \Cloudflare\API\Auth\APIKey;
-use \Cloudflare\API\Adapter\Guzzle;
+use Cloudflare\API\Auth\APIKey;
+use Cloudflare\API\Adapter\Guzzle;
 use Cloudflare\API\Endpoints\DNS;
 use Cloudflare\API\Endpoints\EndpointException;
 use Cloudflare\API\Endpoints\Zones;