moved to namespace Deployment (BC break)

dg · Sep 2, 2014 · 7567b74 · 7567b74
1 parent 6e1a0b0
commit 7567b74
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 12 deletions.
diff --git a/Deployment/deployment.php b/Deployment/deployment.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Deployment;
+
 require __DIR__ . '/libs/Server.php';
 require __DIR__ . '/libs/FtpServer.php';
 require __DIR__ . '/libs/SshServer.php';

diff --git a/Deployment/libs/CliRunner.php b/Deployment/libs/CliRunner.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -98,7 +99,7 @@ private function createDeployer($config)
 		];
 
 		if (empty($config['remote']) || !parse_url($config['remote'])) {
-			throw new Exception("Missing or invalid 'remote' URL in config.");
+			throw new \Exception("Missing or invalid 'remote' URL in config.");
 		}
 
 		$server = parse_url($config['remote'], PHP_URL_SCHEME) === 'sftp'

diff --git a/Deployment/libs/CommandLine.php b/Deployment/libs/CommandLine.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**

diff --git a/Deployment/libs/Deployer.php b/Deployment/libs/Deployer.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -66,7 +67,7 @@ public function __construct(Server $server, $local, Logger $logger)
 	{
 		$this->local = realpath($local);
 		if (!$this->local) {
-			throw new InvalidArgumentException("Directory $local not found.");
+			throw new \InvalidArgumentException("Directory $local not found.");
 		}
 		$this->server = $server;
 		$this->logger = $logger;
@@ -374,16 +375,16 @@ private function runJobs(array $jobs)
 				}
 				$this->logger->log("$job: $out");
 				if ($err) {
-					throw new RuntimeException("Error in job $job");
+					throw new \RuntimeException("Error in job $job");
 				}
 
 			} elseif (is_callable($job)) {
 				if ($job($this->server, $this->logger, $this) === FALSE) {
-					throw new RuntimeException('Error in job');
+					throw new \RuntimeException('Error in job');
 				}
 
 			} else {
-				throw new InvalidArgumentException("Invalid job $job.");
+				throw new \InvalidArgumentException("Invalid job $job.");
 			}
 		}
 	}

diff --git a/Deployment/libs/FtpServer.php b/Deployment/libs/FtpServer.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -35,11 +36,11 @@ class FtpServer implements Server
 	public function __construct($url, $passiveMode = TRUE)
 	{
 		if (!extension_loaded('ftp')) {
-			throw new Exception('PHP extension FTP is not loaded.');
+			throw new \Exception('PHP extension FTP is not loaded.');
 		}
 		$parts = parse_url($url);
 		if (!isset($parts['scheme'], $parts['user'], $parts['pass']) || ($parts['scheme'] !== 'ftp' && $parts['scheme'] !== 'ftps')) {
-			throw new InvalidArgumentException("Invalid URL or missing username or password: $url");
+			throw new \InvalidArgumentException("Invalid URL or missing username or password: $url");
 		}
 		$this->url = $url;
 		$this->passiveMode = (bool) $passiveMode;

diff --git a/Deployment/libs/Logger.php b/Deployment/libs/Logger.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**

diff --git a/Deployment/libs/Preprocessor.php b/Deployment/libs/Preprocessor.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -121,7 +122,7 @@ private function execute($command, $input)
 			NULL, NULL, ['bypass_shell' => TRUE]
 		);
 		if (!is_resource($process)) {
-			throw new Exception("Unable start process $command.");
+			throw new \Exception("Unable start process $command.");
 		}
 
 		fwrite($pipes[0], $input);

diff --git a/Deployment/libs/Server.php b/Deployment/libs/Server.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -81,6 +82,6 @@ function execute($command);
 
 
 
-class ServerException extends Exception
+class ServerException extends \Exception
 {
 }
diff --git a/Deployment/libs/SshServer.php b/Deployment/libs/SshServer.php
@@ -6,6 +6,7 @@
  * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
  */
 
+namespace Deployment;
 
 
 /**
@@ -32,11 +33,11 @@ class SshServer implements Server
 	public function __construct($url)
 	{
 		if (!extension_loaded('ssh2')) {
-			throw new Exception('PHP extension SSH2 is not loaded.');
+			throw new \Exception('PHP extension SSH2 is not loaded.');
 		}
 		$parts = parse_url($url);
 		if (!isset($parts['scheme'], $parts['user']) || $parts['scheme'] !== 'sftp') {
-			throw new InvalidArgumentException("Invalid URL or missing username: $url");
+			throw new \InvalidArgumentException("Invalid URL or missing username: $url");
 		}
 		$this->url = $url;
 	}

diff --git a/deployment.sample.php b/deployment.sample.php
@@ -15,7 +15,7 @@
 		',
 		'allowdelete' => TRUE,
 		'before' => array(
-			function (Server $server, Logger $logger, Deployer $deployer) {
+			function (Deployment\Server $server, Deployment\Logger $logger, Deployment\Deployer $deployer) {
 				$logger->log('Hello!');
 			},
 		),
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
      * Copyright (c) 2009 David Grudl (http://davidgrudl.com)
      */
+    namespace Deployment;
     /**
@@ Expand Down @@