silverstripe / deploynaut

code/form/DataArchiveFileField.php

Indentation +41 added lines, -41 removed lines

@@ -11,45 +11,45 @@
 class DataArchiveFileField extends FileField
 {
 
-    /**
-     * @param DataObjectInterface $record
-     * @return bool|DataArchiveFileField
-     */
-    public function saveInto(DataObjectInterface $record)
-    {
-        if (!isset($_FILES[$this->name])) {
-            return false;
-        }
-
-        if (!($record instanceof DNDataArchive)) {
-            throw new LogicException('Saving into wrong type, expected DNDataArchive');
-        }
-
-        $dataArchive = $record;
-
-        /** @var DNDataTransfer $dataTransfer */
-        $dataTransfer = $dataArchive->DataTransfers()->First();
-        if (!$dataTransfer) {
-            throw new LogicException('No transfer found');
-        }
-
-        $fileClass = File::get_class_for_file_extension(pathinfo($_FILES[$this->name]['name'], PATHINFO_EXTENSION));
-        $file = new $fileClass();
-        // Hack: loadIntoFile assumes paths relative to assets,
-        //  otherwise it creates the whole structure *within* that folder
-        $absolutePath = $dataArchive->generateFilepath($dataTransfer);
-        $relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
-        $this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-        if ($this->upload->isError()) {
-            return false;
-        }
-
-        $file = $this->upload->getFile();
-        if ($this->relationAutoSetting) {
-            // save to record
-            $record->{$this->name . 'ID'} = $file->ID;
-        }
-
-        return $this;
-    }
+	/**
+	 * @param DataObjectInterface $record
+	 * @return bool|DataArchiveFileField
+	 */
+	public function saveInto(DataObjectInterface $record)
+	{
+		if (!isset($_FILES[$this->name])) {
+			return false;
+		}
+
+		if (!($record instanceof DNDataArchive)) {
+			throw new LogicException('Saving into wrong type, expected DNDataArchive');
+		}
+
+		$dataArchive = $record;
+
+		/** @var DNDataTransfer $dataTransfer */
+		$dataTransfer = $dataArchive->DataTransfers()->First();
+		if (!$dataTransfer) {
+			throw new LogicException('No transfer found');
+		}
+
+		$fileClass = File::get_class_for_file_extension(pathinfo($_FILES[$this->name]['name'], PATHINFO_EXTENSION));
+		$file = new $fileClass();
+		// Hack: loadIntoFile assumes paths relative to assets,
+		//  otherwise it creates the whole structure *within* that folder
+		$absolutePath = $dataArchive->generateFilepath($dataTransfer);
+		$relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
+		$this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
+		if ($this->upload->isError()) {
+			return false;
+		}
+
+		$file = $this->upload->getFile();
+		if ($this->relationAutoSetting) {
+			// save to record
+			$record->{$this->name . 'ID'} = $file->ID;
+		}
+
+		return $this;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@ 
      */
     public function saveInto(DataObjectInterface $record)
     {
-        if (!isset($_FILES[$this->name])) {
+        if(!isset($_FILES[$this->name])) {
             return false;
         }
 
-        if (!($record instanceof DNDataArchive)) {
+        if(!($record instanceof DNDataArchive)) {
             throw new LogicException('Saving into wrong type, expected DNDataArchive');
         }
 
@@ -29,7 +29,7 @@ 
 
         /** @var DNDataTransfer $dataTransfer */
         $dataTransfer = $dataArchive->DataTransfers()->First();
-        if (!$dataTransfer) {
+        if(!$dataTransfer) {
             throw new LogicException('No transfer found');
         }
 
@@ -40,12 +40,12 @@ 
         $absolutePath = $dataArchive->generateFilepath($dataTransfer);
         $relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
         $this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-        if ($this->upload->isError()) {
+        if($this->upload->isError()) {
             return false;
         }
 
         $file = $this->upload->getFile();
-        if ($this->relationAutoSetting) {
+        if($this->relationAutoSetting) {
             // save to record
             $record->{$this->name . 'ID'} = $file->ID;
         }

Braces +2 added lines, -4 removed lines

@@ -8,15 +8,13 @@
  * of FileField to set the folder path *before* uploading the file,
  * at which point we don't have a {@link DataTransfer} ID yet, so can't generate the path.
  */
-class DataArchiveFileField extends FileField
-{
+class DataArchiveFileField extends FileField {
 
     /**
      * @param DataObjectInterface $record
      * @return bool|DataArchiveFileField
      */
-    public function saveInto(DataObjectInterface $record)
-    {
+    public function saveInto(DataObjectInterface $record) {
         if (!isset($_FILES[$this->name])) {
             return false;
         }

code/form/TabbedSelectionGroup.php

Indentation +16 added lines, -16 removed lines

@@ -3,23 +3,23 @@
 class TabbedSelectionGroup extends SelectionGroup
 {
 
-    /**
-     * @return ArrayList
-     */
-    public function FieldList()
-    {
-        $items = CompositeField::FieldList()->toArray();
-        $fields = new ArrayList();
+	/**
+	 * @return ArrayList
+	 */
+	public function FieldList()
+	{
+		$items = CompositeField::FieldList()->toArray();
+		$fields = new ArrayList();
 
-        foreach ($items as $item) {
-            $extra = array(
-                'Selected' => $this->value == $item->getValue(),
-            );
+		foreach ($items as $item) {
+			$extra = array(
+				'Selected' => $this->value == $item->getValue(),
+			);
 
-            $item = $item->customise($extra);
-            $fields->push($item);
-        }
+			$item = $item->customise($extra);
+			$fields->push($item);
+		}
 
-        return $fields;
-    }
+		return $fields;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         $items = CompositeField::FieldList()->toArray();
         $fields = new ArrayList();
 
-        foreach ($items as $item) {
+        foreach($items as $item) {
             $extra = array(
                 'Selected' => $this->value == $item->getValue(),
             );

Braces +2 added lines, -4 removed lines

@@ -1,13 +1,11 @@
 <?php
 
-class TabbedSelectionGroup extends SelectionGroup
-{
+class TabbedSelectionGroup extends SelectionGroup {
 
     /**
      * @return ArrayList
      */
-    public function FieldList()
-    {
+    public function FieldList() {
         $items = CompositeField::FieldList()->toArray();
         $fields = new ArrayList();
 

code/jobs/CreateEnvJob.php

Indentation +64 added lines, -64 removed lines

@@ -2,75 +2,75 @@
 class CreateEnvJob
 {
 
-    /**
-     *
-     * @var array
-     */
-    public $args;
+	/**
+	 *
+	 * @var array
+	 */
+	public $args;
 
-    /**
-     *
-     */
-    public function setUp()
-    {
-        $this->updateStatus('Started');
-        chdir(BASE_PATH);
-    }
+	/**
+	 *
+	 */
+	public function setUp()
+	{
+		$this->updateStatus('Started');
+		chdir(BASE_PATH);
+	}
 
-    /**
-     *
-     * @global array $databaseConfig
-     */
-    public function tearDown()
-    {
-        $this->updateStatus('Finished');
-        chdir(BASE_PATH);
-    }
+	/**
+	 *
+	 * @global array $databaseConfig
+	 */
+	public function tearDown()
+	{
+		$this->updateStatus('Finished');
+		chdir(BASE_PATH);
+	}
 
-    /**
-     *
-     */
-    public function perform()
-    {
-        echo "[-] CreateEnvJob starting" . PHP_EOL;
-        // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
-        try {
-            $envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
-            if (!($envCreate && $envCreate->exists())) {
-                throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
-            }
+	/**
+	 *
+	 */
+	public function perform()
+	{
+		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
+		try {
+			$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
+			if (!($envCreate && $envCreate->exists())) {
+				throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
+			}
 
-            // This will throw and exception if it fails.
-            $envCreate->createEnvironment();
-        } catch (Exception $e) {
-            $this->updateStatus('Failed');
-            echo "[-] CreateEnvJob failed" . PHP_EOL;
-            throw $e;
-        }
-        echo "[-] CreateEnvJob finished" . PHP_EOL;
-    }
+			// This will throw and exception if it fails.
+			$envCreate->createEnvironment();
+		} catch (Exception $e) {
+			$this->updateStatus('Failed');
+			echo "[-] CreateEnvJob failed" . PHP_EOL;
+			throw $e;
+		}
+		echo "[-] CreateEnvJob finished" . PHP_EOL;
+	}
 
-    /**
-     *
-     * @param string $status
-     * @global array $databaseConfig
-     */
-    protected function updateStatus($status)
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
+	/**
+	 *
+	 * @param string $status
+	 * @global array $databaseConfig
+	 */
+	protected function updateStatus($status)
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
 
-        $record = DNCreateEnvironment::get()->byID($this->args['createID']);
-        $record->Status = $status;
-        $record->write();
-    }
+		$record = DNCreateEnvironment::get()->byID($this->args['createID']);
+		$record->Status = $status;
+		$record->write();
+	}
 
-    /**
-     *
-     * @return DNData
-     */
-    protected function DNData()
-    {
-        return DNData::inst();
-    }
+	/**
+	 *
+	 * @return DNData
+	 */
+	protected function DNData()
+	{
+		return DNData::inst();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -36,13 +36,13 @@
         // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
         try {
             $envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
-            if (!($envCreate && $envCreate->exists())) {
+            if(!($envCreate && $envCreate->exists())) {
                 throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
             }
 
             // This will throw and exception if it fails.
             $envCreate->createEnvironment();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
             echo "[-] CreateEnvJob failed" . PHP_EOL;
             throw $e;

Braces +6 added lines, -12 removed lines

@@ -1,6 +1,5 @@ 
 <?php
-class CreateEnvJob
-{
+class CreateEnvJob {
 
     /**
      *
@@ -11,8 +10,7 @@ 
     /**
      *
      */
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
@@ -21,8 +19,7 @@ 
      *
      * @global array $databaseConfig
      */
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
@@ -30,8 +27,7 @@ 
     /**
      *
      */
-    public function perform()
-    {
+    public function perform() {
         echo "[-] CreateEnvJob starting" . PHP_EOL;
         // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
         try {
@@ -55,8 +51,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
 
@@ -69,8 +64,7 @@ 
      *
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/DataTransferJob.php

Indentation +120 added lines, -120 removed lines

@@ -10,124 +10,124 @@
 class DataTransferJob
 {
 
-    /**
-     * set by a resque worker
-     */
-    public $args = array();
-
-    public function setUp()
-    {
-        $this->updateStatus('Started');
-        chdir(BASE_PATH);
-    }
-
-    public function tearDown()
-    {
-        $this->updateStatus('Finished');
-        chdir(BASE_PATH);
-    }
-
-    public function perform()
-    {
-        echo "[-] DataTransferJob starting" . PHP_EOL;
-        $log = new DeploynautLogFile($this->args['logfile']);
-        $dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
-        $environment = $dataTransfer->Environment();
-        $backupDataTransfer = null;
-
-        if (!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
-            $backupDataTransfer = DNDataTransfer::create();
-            $backupDataTransfer->EnvironmentID = $environment->ID;
-            $backupDataTransfer->Direction = 'get';
-            $backupDataTransfer->Mode = $dataTransfer->Mode;
-            $backupDataTransfer->DataArchiveID = null;
-            $backupDataTransfer->ResqueToken = $dataTransfer->ResqueToken;
-            $backupDataTransfer->AuthorID = $dataTransfer->AuthorID;
-            $backupDataTransfer->write();
-
-            $dataTransfer->BackupDataTransferID = $backupDataTransfer->ID;
-            $dataTransfer->write();
-        }
-
-        // This is a bit icky, but there is no easy way of capturing a failed run by using the PHP Resque
-        try {
-            // Disallow concurrent jobs (don't rely on queuing implementation to restrict this)
-            // Only consider data transfers started in the last 30 minutes (older jobs probably got stuck)
-            $runningTransfers = DNDataTransfer::get()
-                ->filter(array(
-                    'EnvironmentID' => $environment->ID,
-                    'Status' => array('Queued', 'Started'),
-                    'Created:GreaterThan' => strtotime('-30 minutes')
-                ))
-                ->exclude('ID', $dataTransfer->ID);
-
-            if ($runningTransfers->count()) {
-                $runningTransfer = $runningTransfers->first();
-                $log->write(sprintf(
-                    '[-] Error: another transfer is in progress (started at %s by %s)',
-                    $runningTransfer->dbObject('Created')->Nice(),
-                    $runningTransfer->Author()->Title
-                ));
-                throw new RuntimeException(sprintf(
-                    'Another transfer is in progress (started at %s by %s)',
-                    $runningTransfer->dbObject('Created')->Nice(),
-                    $runningTransfer->Author()->Title
-                ));
-            }
-
-
-            // before we push data to an environment, we'll make a backup first
-            if ($backupDataTransfer) {
-                $log->write('Backing up existing data');
-                $environment->Backend()->dataTransfer(
-                    $backupDataTransfer,
-                    $log
-                );
-            }
-
-            $environment->Backend()->dataTransfer(
-                $dataTransfer,
-                $log
-            );
-        } catch (RuntimeException $exc) {
-            $log->write($exc->getMessage());
-
-            if ($backupDataTransfer) {
-                $backupDataTransfer->Status = 'Failed';
-                $backupDataTransfer->write();
-            }
-
-            $this->updateStatus('Failed');
-            echo "[-] DataTransferJob failed" . PHP_EOL;
-            throw $exc;
-        }
-
-        if ($backupDataTransfer) {
-            $backupDataTransfer->Status = 'Finished';
-            $backupDataTransfer->write();
-        }
-
-        echo "[-] DataTransferJob finished" . PHP_EOL;
-    }
-
-    /**
-     * @param string $status
-     * @global array $databaseConfig
-     */
-    protected function updateStatus($status)
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
-        $env = DNDataTransfer::get()->byID($this->args['dataTransferID']);
-        $env->Status = $status;
-        $env->write();
-    }
-
-    /**
-     * @return DNData
-     */
-    protected function DNData()
-    {
-        return DNData::inst();
-    }
+	/**
+	 * set by a resque worker
+	 */
+	public $args = array();
+
+	public function setUp()
+	{
+		$this->updateStatus('Started');
+		chdir(BASE_PATH);
+	}
+
+	public function tearDown()
+	{
+		$this->updateStatus('Finished');
+		chdir(BASE_PATH);
+	}
+
+	public function perform()
+	{
+		echo "[-] DataTransferJob starting" . PHP_EOL;
+		$log = new DeploynautLogFile($this->args['logfile']);
+		$dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
+		$environment = $dataTransfer->Environment();
+		$backupDataTransfer = null;
+
+		if (!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
+			$backupDataTransfer = DNDataTransfer::create();
+			$backupDataTransfer->EnvironmentID = $environment->ID;
+			$backupDataTransfer->Direction = 'get';
+			$backupDataTransfer->Mode = $dataTransfer->Mode;
+			$backupDataTransfer->DataArchiveID = null;
+			$backupDataTransfer->ResqueToken = $dataTransfer->ResqueToken;
+			$backupDataTransfer->AuthorID = $dataTransfer->AuthorID;
+			$backupDataTransfer->write();
+
+			$dataTransfer->BackupDataTransferID = $backupDataTransfer->ID;
+			$dataTransfer->write();
+		}
+
+		// This is a bit icky, but there is no easy way of capturing a failed run by using the PHP Resque
+		try {
+			// Disallow concurrent jobs (don't rely on queuing implementation to restrict this)
+			// Only consider data transfers started in the last 30 minutes (older jobs probably got stuck)
+			$runningTransfers = DNDataTransfer::get()
+				->filter(array(
+					'EnvironmentID' => $environment->ID,
+					'Status' => array('Queued', 'Started'),
+					'Created:GreaterThan' => strtotime('-30 minutes')
+				))
+				->exclude('ID', $dataTransfer->ID);
+
+			if ($runningTransfers->count()) {
+				$runningTransfer = $runningTransfers->first();
+				$log->write(sprintf(
+					'[-] Error: another transfer is in progress (started at %s by %s)',
+					$runningTransfer->dbObject('Created')->Nice(),
+					$runningTransfer->Author()->Title
+				));
+				throw new RuntimeException(sprintf(
+					'Another transfer is in progress (started at %s by %s)',
+					$runningTransfer->dbObject('Created')->Nice(),
+					$runningTransfer->Author()->Title
+				));
+			}
+
+
+			// before we push data to an environment, we'll make a backup first
+			if ($backupDataTransfer) {
+				$log->write('Backing up existing data');
+				$environment->Backend()->dataTransfer(
+					$backupDataTransfer,
+					$log
+				);
+			}
+
+			$environment->Backend()->dataTransfer(
+				$dataTransfer,
+				$log
+			);
+		} catch (RuntimeException $exc) {
+			$log->write($exc->getMessage());
+
+			if ($backupDataTransfer) {
+				$backupDataTransfer->Status = 'Failed';
+				$backupDataTransfer->write();
+			}
+
+			$this->updateStatus('Failed');
+			echo "[-] DataTransferJob failed" . PHP_EOL;
+			throw $exc;
+		}
+
+		if ($backupDataTransfer) {
+			$backupDataTransfer->Status = 'Finished';
+			$backupDataTransfer->write();
+		}
+
+		echo "[-] DataTransferJob finished" . PHP_EOL;
+	}
+
+	/**
+	 * @param string $status
+	 * @global array $databaseConfig
+	 */
+	protected function updateStatus($status)
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
+		$env = DNDataTransfer::get()->byID($this->args['dataTransferID']);
+		$env->Status = $status;
+		$env->write();
+	}
+
+	/**
+	 * @return DNData
+	 */
+	protected function DNData()
+	{
+		return DNData::inst();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
         $environment = $dataTransfer->Environment();
         $backupDataTransfer = null;
 
-        if (!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
+        if(!empty($this->args['backupBeforePush']) && $dataTransfer->Direction == 'push') {
             $backupDataTransfer = DNDataTransfer::create();
             $backupDataTransfer->EnvironmentID = $environment->ID;
             $backupDataTransfer->Direction = 'get';
@@ -61,7 +61,7 @@ 
                 ))
                 ->exclude('ID', $dataTransfer->ID);
 
-            if ($runningTransfers->count()) {
+            if($runningTransfers->count()) {
                 $runningTransfer = $runningTransfers->first();
                 $log->write(sprintf(
                     '[-] Error: another transfer is in progress (started at %s by %s)',
@@ -77,7 +77,7 @@ 
 
 
             // before we push data to an environment, we'll make a backup first
-            if ($backupDataTransfer) {
+            if($backupDataTransfer) {
                 $log->write('Backing up existing data');
                 $environment->Backend()->dataTransfer(
                     $backupDataTransfer,
@@ -89,10 +89,10 @@ 
                 $dataTransfer,
                 $log
             );
-        } catch (RuntimeException $exc) {
+        } catch(RuntimeException $exc) {
             $log->write($exc->getMessage());
 
-            if ($backupDataTransfer) {
+            if($backupDataTransfer) {
                 $backupDataTransfer->Status = 'Failed';
                 $backupDataTransfer->write();
             }
@@ -102,7 +102,7 @@ 
             throw $exc;
         }
 
-        if ($backupDataTransfer) {
+        if($backupDataTransfer) {
             $backupDataTransfer->Status = 'Finished';
             $backupDataTransfer->write();
         }

Braces +6 added lines, -12 removed lines

@@ -7,28 +7,24 @@ 
  * @package deploynaut
  * @subpackage jobs
  */
-class DataTransferJob
-{
+class DataTransferJob {
 
     /**
      * set by a resque worker
      */
     public $args = array();
 
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         echo "[-] DataTransferJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
@@ -114,8 +110,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
         $env = DNDataTransfer::get()->byID($this->args['dataTransferID']);
@@ -126,8 +121,7 @@ 
     /**
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/DeployJob.php

Indentation +78 added lines, -78 removed lines

@@ -6,89 +6,89 @@
 class DeployJob
 {
 
-    /**
-     * @var array
-     */
-    public $args;
+	/**
+	 * @var array
+	 */
+	public $args;
 
-    public function setUp()
-    {
-        $this->updateStatus('Started');
-        chdir(BASE_PATH);
-    }
+	public function setUp()
+	{
+		$this->updateStatus('Started');
+		chdir(BASE_PATH);
+	}
 
-    public function tearDown()
-    {
-        $this->updateStatus('Finished');
-        chdir(BASE_PATH);
-    }
+	public function tearDown()
+	{
+		$this->updateStatus('Finished');
+		chdir(BASE_PATH);
+	}
 
-    public function perform()
-    {
-        echo "[-] DeployJob starting" . PHP_EOL;
-        $log = new DeploynautLogFile($this->args['logfile']);
-        $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
-        $DNEnvironment = $DNProject->Environments()->filter('Name', $this->args['environmentName'])->First();
-        // This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
-        try {
-            // Disallow concurrent deployments (don't rely on queuing implementation to restrict this)
-            // Only consider deployments started in the last 30 minutes (older jobs probably got stuck)
-            $runningDeployments = DNDeployment::get()
-                ->filter(array(
-                    'EnvironmentID' => $DNEnvironment->ID,
-                    'Status' => array('Queued', 'Started'),
-                    'Created:GreaterThan' => strtotime('-30 minutes')
-                ))
-                ->exclude('ID', $this->args['deploymentID']);
+	public function perform()
+	{
+		echo "[-] DeployJob starting" . PHP_EOL;
+		$log = new DeploynautLogFile($this->args['logfile']);
+		$DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
+		$DNEnvironment = $DNProject->Environments()->filter('Name', $this->args['environmentName'])->First();
+		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
+		try {
+			// Disallow concurrent deployments (don't rely on queuing implementation to restrict this)
+			// Only consider deployments started in the last 30 minutes (older jobs probably got stuck)
+			$runningDeployments = DNDeployment::get()
+				->filter(array(
+					'EnvironmentID' => $DNEnvironment->ID,
+					'Status' => array('Queued', 'Started'),
+					'Created:GreaterThan' => strtotime('-30 minutes')
+				))
+				->exclude('ID', $this->args['deploymentID']);
 
-            if ($runningDeployments->count()) {
-                $runningDeployment = $runningDeployments->first();
-                $log->write(sprintf(
-                    '[-] Error: another deployment is in progress (started at %s by %s)',
-                    $runningDeployment->dbObject('Created')->Nice(),
-                    $runningDeployment->Deployer()->Title
-                ));
-                throw new RuntimeException(sprintf(
-                    'Another deployment is in progress (started at %s by %s)',
-                    $runningDeployment->dbObject('Created')->Nice(),
-                    $runningDeployment->Deployer()->Title
-                ));
-            }
+			if ($runningDeployments->count()) {
+				$runningDeployment = $runningDeployments->first();
+				$log->write(sprintf(
+					'[-] Error: another deployment is in progress (started at %s by %s)',
+					$runningDeployment->dbObject('Created')->Nice(),
+					$runningDeployment->Deployer()->Title
+				));
+				throw new RuntimeException(sprintf(
+					'Another deployment is in progress (started at %s by %s)',
+					$runningDeployment->dbObject('Created')->Nice(),
+					$runningDeployment->Deployer()->Title
+				));
+			}
 
-            $DNEnvironment->Backend()->deploy(
-                $DNEnvironment,
-                $log,
-                $DNProject,
-                // Pass all args to give the backend full visibility. These args also contain
-                // all options from the DeploymentStrategy merged in, including sha.
-                $this->args
-            );
-        } catch (Exception $e) {
-            $this->updateStatus('Failed');
-            echo "[-] DeployJob failed" . PHP_EOL;
-            throw $e;
-        }
-        echo "[-] DeployJob finished" . PHP_EOL;
-    }
+			$DNEnvironment->Backend()->deploy(
+				$DNEnvironment,
+				$log,
+				$DNProject,
+				// Pass all args to give the backend full visibility. These args also contain
+				// all options from the DeploymentStrategy merged in, including sha.
+				$this->args
+			);
+		} catch (Exception $e) {
+			$this->updateStatus('Failed');
+			echo "[-] DeployJob failed" . PHP_EOL;
+			throw $e;
+		}
+		echo "[-] DeployJob finished" . PHP_EOL;
+	}
 
-    /**
-     * @param string $status
-     * @global array $databaseConfig
-     */
-    protected function updateStatus($status)
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
-        $dnDeployment = DNDeployment::get()->byID($this->args['deploymentID']);
-        $dnDeployment->Status = $status;
-        $dnDeployment->write();
-    }
+	/**
+	 * @param string $status
+	 * @global array $databaseConfig
+	 */
+	protected function updateStatus($status)
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
+		$dnDeployment = DNDeployment::get()->byID($this->args['deploymentID']);
+		$dnDeployment->Status = $status;
+		$dnDeployment->write();
+	}
 
-    /**
-     * @return DNData
-     */
-    protected function DNData()
-    {
-        return DNData::inst();
-    }
+	/**
+	 * @return DNData
+	 */
+	protected function DNData()
+	{
+		return DNData::inst();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
                 ))
                 ->exclude('ID', $this->args['deploymentID']);
 
-            if ($runningDeployments->count()) {
+            if($runningDeployments->count()) {
                 $runningDeployment = $runningDeployments->first();
                 $log->write(sprintf(
                     '[-] Error: another deployment is in progress (started at %s by %s)',
@@ -63,7 +63,7 @@ 
                 // all options from the DeploymentStrategy merged in, including sha.
                 $this->args
             );
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
             echo "[-] DeployJob failed" . PHP_EOL;
             throw $e;

Braces +6 added lines, -12 removed lines

@@ -3,28 +3,24 @@ 
 /**
  * Runs a deployment via the most appropriate backend
  */
-class DeployJob
-{
+class DeployJob {
 
     /**
      * @var array
      */
     public $args;
 
-    public function setUp()
-    {
+    public function setUp() {
         $this->updateStatus('Started');
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         echo "[-] DeployJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
@@ -75,8 +71,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
         $dnDeployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -87,8 +82,7 @@ 
     /**
      * @return DNData
      */
-    protected function DNData()
-    {
+    protected function DNData() {
         return DNData::inst();
     }
 }

code/jobs/FetchJob.php

Indentation +157 added lines, -157 removed lines

@@ -3,161 +3,161 @@
 class FetchJob
 {
 
-    public $args;
-
-    /**
-     * @var DNProject
-     */
-    protected $project;
-
-    /**
-     * @var DeploynautLogFile
-     */
-    protected $log;
-
-    /**
-     * @var string
-     */
-    protected $user;
-
-    /**
-     * @global array $databaseConfig
-     */
-    public function setUp()
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
-
-        $this->updateStatus('Started');
-        chdir(BASE_PATH);
-    }
-
-    public function tearDown()
-    {
-        $this->updateStatus('Finished');
-        chdir(BASE_PATH);
-    }
-
-    public function perform()
-    {
-        set_time_limit(0);
-
-        if (!empty($this->args['logfile'])) {
-            $this->log = new DeploynautLogFile($this->args['logfile']);
-        }
-
-        $this->project = DNProject::get()->byId($this->args['projectID']);
-        if (!($this->project && $this->project->exists())) {
-            throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
-        }
-
-        $this->user = DNData::inst()->getGitUser() ?: null;
-
-        // Disallow concurrent git fetches on the same project.
-        // Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
-        if (!empty($this->args['fetchID'])) {
-            $runningFetches = DNGitFetch::get()
-                ->filter(array(
-                    'ProjectID' => $this->project->ID,
-                    'Status' => array('Queued', 'Started'),
-                    'Created:GreaterThan' => strtotime('-30 minutes')
-                ))
-                ->exclude('ID', $this->args['fetchID']);
-
-            if ($runningFetches->count()) {
-                $runningFetch = $runningFetches->first();
-                $message = sprintf(
-                    'Another fetch is in progress (started at %s by %s)',
-                    $runningFetch->dbObject('Created')->Nice(),
-                    $runningFetch->Deployer()->Title
-                );
-                if ($this->log) {
-                    $this->log->write($message);
-                }
-                throw new RuntimeException($message);
-            }
-        }
-
-        // Decide whether we need to just update what we already have
-        // or initiate a clone if no local repo exists.
-        try {
-            if ($this->project->repoExists() && empty($this->args['forceClone'])) {
-                $this->fetchRepo();
-            } else {
-                $this->cloneRepo();
-            }
-        } catch (Exception $e) {
-            $this->updateStatus('Failed');
-            if ($this->log) {
-                $this->log->write($e->getMessage());
-            }
-            throw $e;
-        }
-    }
-
-    protected function fetchRepo()
-    {
-        $this->runCommand(
-            'git fetch -p origin +refs/heads/*:refs/heads/* --tags',
-            $this->project->getLocalCVSPath()
-        );
-    }
-
-    protected function cloneRepo()
-    {
-        if (file_exists($this->project->getLocalCVSPath())) {
-            $this->runCommand(sprintf(
-                'rm -rf %s',
-                escapeshellarg($this->project->getLocalCVSPath())
-            ));
-        }
-
-        $this->runCommand(sprintf(
-            'git clone --bare -q %s %s',
-            escapeshellarg($this->project->CVSPath),
-            escapeshellarg($this->project->getLocalCVSPath())
-        ));
-    }
-
-    /**
-     * Run a shell command.
-     *
-     * @param string $command The command to run
-     * @param string|null $workingDir The working dir to run command in
-     * @throws RuntimeException
-     */
-    protected function runCommand($command, $workingDir = null)
-    {
-        if (!empty($this->user)) {
-            $command = sprintf('sudo -u %s %s', $this->user, $command);
-        }
-        if ($this->log) {
-            $this->log->write(sprintf('Running command: %s', $command));
-        }
-        $process = new \Symfony\Component\Process\Process($command, $workingDir);
-        $process->setEnv($this->project->getProcessEnv());
-        $process->setTimeout(1800);
-        $process->run();
-        if (!$process->isSuccessful()) {
-            throw new RuntimeException($process->getErrorOutput());
-        }
-    }
-
-    /**
-     * @param string $status
-     * @global array $databaseConfig
-     */
-    protected function updateStatus($status)
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
-
-        if (!empty($this->args['fetchID'])) {
-            $fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-            if ($fetch && $fetch->exists()) {
-                $fetch->Status = $status;
-                $fetch->write();
-            }
-        }
-    }
+	public $args;
+
+	/**
+	 * @var DNProject
+	 */
+	protected $project;
+
+	/**
+	 * @var DeploynautLogFile
+	 */
+	protected $log;
+
+	/**
+	 * @var string
+	 */
+	protected $user;
+
+	/**
+	 * @global array $databaseConfig
+	 */
+	public function setUp()
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
+
+		$this->updateStatus('Started');
+		chdir(BASE_PATH);
+	}
+
+	public function tearDown()
+	{
+		$this->updateStatus('Finished');
+		chdir(BASE_PATH);
+	}
+
+	public function perform()
+	{
+		set_time_limit(0);
+
+		if (!empty($this->args['logfile'])) {
+			$this->log = new DeploynautLogFile($this->args['logfile']);
+		}
+
+		$this->project = DNProject::get()->byId($this->args['projectID']);
+		if (!($this->project && $this->project->exists())) {
+			throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
+		}
+
+		$this->user = DNData::inst()->getGitUser() ?: null;
+
+		// Disallow concurrent git fetches on the same project.
+		// Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
+		if (!empty($this->args['fetchID'])) {
+			$runningFetches = DNGitFetch::get()
+				->filter(array(
+					'ProjectID' => $this->project->ID,
+					'Status' => array('Queued', 'Started'),
+					'Created:GreaterThan' => strtotime('-30 minutes')
+				))
+				->exclude('ID', $this->args['fetchID']);
+
+			if ($runningFetches->count()) {
+				$runningFetch = $runningFetches->first();
+				$message = sprintf(
+					'Another fetch is in progress (started at %s by %s)',
+					$runningFetch->dbObject('Created')->Nice(),
+					$runningFetch->Deployer()->Title
+				);
+				if ($this->log) {
+					$this->log->write($message);
+				}
+				throw new RuntimeException($message);
+			}
+		}
+
+		// Decide whether we need to just update what we already have
+		// or initiate a clone if no local repo exists.
+		try {
+			if ($this->project->repoExists() && empty($this->args['forceClone'])) {
+				$this->fetchRepo();
+			} else {
+				$this->cloneRepo();
+			}
+		} catch (Exception $e) {
+			$this->updateStatus('Failed');
+			if ($this->log) {
+				$this->log->write($e->getMessage());
+			}
+			throw $e;
+		}
+	}
+
+	protected function fetchRepo()
+	{
+		$this->runCommand(
+			'git fetch -p origin +refs/heads/*:refs/heads/* --tags',
+			$this->project->getLocalCVSPath()
+		);
+	}
+
+	protected function cloneRepo()
+	{
+		if (file_exists($this->project->getLocalCVSPath())) {
+			$this->runCommand(sprintf(
+				'rm -rf %s',
+				escapeshellarg($this->project->getLocalCVSPath())
+			));
+		}
+
+		$this->runCommand(sprintf(
+			'git clone --bare -q %s %s',
+			escapeshellarg($this->project->CVSPath),
+			escapeshellarg($this->project->getLocalCVSPath())
+		));
+	}
+
+	/**
+	 * Run a shell command.
+	 *
+	 * @param string $command The command to run
+	 * @param string|null $workingDir The working dir to run command in
+	 * @throws RuntimeException
+	 */
+	protected function runCommand($command, $workingDir = null)
+	{
+		if (!empty($this->user)) {
+			$command = sprintf('sudo -u %s %s', $this->user, $command);
+		}
+		if ($this->log) {
+			$this->log->write(sprintf('Running command: %s', $command));
+		}
+		$process = new \Symfony\Component\Process\Process($command, $workingDir);
+		$process->setEnv($this->project->getProcessEnv());
+		$process->setTimeout(1800);
+		$process->run();
+		if (!$process->isSuccessful()) {
+			throw new RuntimeException($process->getErrorOutput());
+		}
+	}
+
+	/**
+	 * @param string $status
+	 * @global array $databaseConfig
+	 */
+	protected function updateStatus($status)
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
+
+		if (!empty($this->args['fetchID'])) {
+			$fetch = DNGitFetch::get()->byID($this->args['fetchID']);
+			if ($fetch && $fetch->exists()) {
+				$fetch->Status = $status;
+				$fetch->write();
+			}
+		}
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -42,12 +42,12 @@ 
     {
         set_time_limit(0);
 
-        if (!empty($this->args['logfile'])) {
+        if(!empty($this->args['logfile'])) {
             $this->log = new DeploynautLogFile($this->args['logfile']);
         }
 
         $this->project = DNProject::get()->byId($this->args['projectID']);
-        if (!($this->project && $this->project->exists())) {
+        if(!($this->project && $this->project->exists())) {
             throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
         }
 
@@ -55,7 +55,7 @@ 
 
         // Disallow concurrent git fetches on the same project.
         // Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
-        if (!empty($this->args['fetchID'])) {
+        if(!empty($this->args['fetchID'])) {
             $runningFetches = DNGitFetch::get()
                 ->filter(array(
                     'ProjectID' => $this->project->ID,
@@ -64,14 +64,14 @@ 
                 ))
                 ->exclude('ID', $this->args['fetchID']);
 
-            if ($runningFetches->count()) {
+            if($runningFetches->count()) {
                 $runningFetch = $runningFetches->first();
                 $message = sprintf(
                     'Another fetch is in progress (started at %s by %s)',
                     $runningFetch->dbObject('Created')->Nice(),
                     $runningFetch->Deployer()->Title
                 );
-                if ($this->log) {
+                if($this->log) {
                     $this->log->write($message);
                 }
                 throw new RuntimeException($message);
@@ -81,14 +81,14 @@ 
         // Decide whether we need to just update what we already have
         // or initiate a clone if no local repo exists.
         try {
-            if ($this->project->repoExists() && empty($this->args['forceClone'])) {
+            if($this->project->repoExists() && empty($this->args['forceClone'])) {
                 $this->fetchRepo();
             } else {
                 $this->cloneRepo();
             }
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             $this->updateStatus('Failed');
-            if ($this->log) {
+            if($this->log) {
                 $this->log->write($e->getMessage());
             }
             throw $e;
@@ -105,7 +105,7 @@ 
 
     protected function cloneRepo()
     {
-        if (file_exists($this->project->getLocalCVSPath())) {
+        if(file_exists($this->project->getLocalCVSPath())) {
             $this->runCommand(sprintf(
                 'rm -rf %s',
                 escapeshellarg($this->project->getLocalCVSPath())
@@ -128,17 +128,17 @@ 
      */
     protected function runCommand($command, $workingDir = null)
     {
-        if (!empty($this->user)) {
+        if(!empty($this->user)) {
             $command = sprintf('sudo -u %s %s', $this->user, $command);
         }
-        if ($this->log) {
+        if($this->log) {
             $this->log->write(sprintf('Running command: %s', $command));
         }
         $process = new \Symfony\Component\Process\Process($command, $workingDir);
         $process->setEnv($this->project->getProcessEnv());
         $process->setTimeout(1800);
         $process->run();
-        if (!$process->isSuccessful()) {
+        if(!$process->isSuccessful()) {
             throw new RuntimeException($process->getErrorOutput());
         }
     }
@@ -152,9 +152,9 @@ 
         global $databaseConfig;
         DB::connect($databaseConfig);
 
-        if (!empty($this->args['fetchID'])) {
+        if(!empty($this->args['fetchID'])) {
             $fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-            if ($fetch && $fetch->exists()) {
+            if($fetch && $fetch->exists()) {
                 $fetch->Status = $status;
                 $fetch->write();
             }

Braces +8 added lines, -16 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-class FetchJob
-{
+class FetchJob {
 
     public $args;
 
@@ -23,8 +22,7 @@ 
     /**
      * @global array $databaseConfig
      */
-    public function setUp()
-    {
+    public function setUp() {
         global $databaseConfig;
         DB::connect($databaseConfig);
 
@@ -32,14 +30,12 @@ 
         chdir(BASE_PATH);
     }
 
-    public function tearDown()
-    {
+    public function tearDown() {
         $this->updateStatus('Finished');
         chdir(BASE_PATH);
     }
 
-    public function perform()
-    {
+    public function perform() {
         set_time_limit(0);
 
         if (!empty($this->args['logfile'])) {
@@ -95,16 +91,14 @@ 
         }
     }
 
-    protected function fetchRepo()
-    {
+    protected function fetchRepo() {
         $this->runCommand(
             'git fetch -p origin +refs/heads/*:refs/heads/* --tags',
             $this->project->getLocalCVSPath()
         );
     }
 
-    protected function cloneRepo()
-    {
+    protected function cloneRepo() {
         if (file_exists($this->project->getLocalCVSPath())) {
             $this->runCommand(sprintf(
                 'rm -rf %s',
@@ -126,8 +120,7 @@ 
      * @param string|null $workingDir The working dir to run command in
      * @throws RuntimeException
      */
-    protected function runCommand($command, $workingDir = null)
-    {
+    protected function runCommand($command, $workingDir = null) {
         if (!empty($this->user)) {
             $command = sprintf('sudo -u %s %s', $this->user, $command);
         }
@@ -147,8 +140,7 @@ 
      * @param string $status
      * @global array $databaseConfig
      */
-    protected function updateStatus($status)
-    {
+    protected function updateStatus($status) {
         global $databaseConfig;
         DB::connect($databaseConfig);
 

code/jobs/PingJob.php

Indentation +31 added lines, -31 removed lines

@@ -7,38 +7,38 @@
 class PingJob
 {
 
-    /**
-     * @var array
-     */
-    public $args;
+	/**
+	 * @var array
+	 */
+	public $args;
 
-    /**
-     * @global array $databaseConfig
-     */
-    public function setUp()
-    {
-        global $databaseConfig;
-        DB::connect($databaseConfig);
-        chdir(BASE_PATH);
-    }
+	/**
+	 * @global array $databaseConfig
+	 */
+	public function setUp()
+	{
+		global $databaseConfig;
+		DB::connect($databaseConfig);
+		chdir(BASE_PATH);
+	}
 
-    /**
-     * @return DNData
-     */
-    public function DNData()
-    {
-        return DNData::inst();
-    }
+	/**
+	 * @return DNData
+	 */
+	public function DNData()
+	{
+		return DNData::inst();
+	}
 
-    /**
-     * Do the actual job by calling the appropiate backend
-     */
-    public function perform()
-    {
-        echo "[-] PingJob starting" . PHP_EOL;
-        $log = new DeploynautLogFile($this->args['logfile']);
-        $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
-        $DNEnvironment = $DNProject->Environments()->filter('Name', $this->args['environmentName'])->First();
-        $DNEnvironment->Backend()->ping($DNEnvironment, $log, $DNProject);
-    }
+	/**
+	 * Do the actual job by calling the appropiate backend
+	 */
+	public function perform()
+	{
+		echo "[-] PingJob starting" . PHP_EOL;
+		$log = new DeploynautLogFile($this->args['logfile']);
+		$DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();
+		$DNEnvironment = $DNProject->Environments()->filter('Name', $this->args['environmentName'])->First();
+		$DNEnvironment->Backend()->ping($DNEnvironment, $log, $DNProject);
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -4,8 +4,7 @@ 
  * Runs a capistrano job that will check the connection and that all folders with
  * permission are setup correctly
  */
-class PingJob
-{
+class PingJob {
 
     /**
      * @var array
@@ -15,8 +14,7 @@ 
     /**
      * @global array $databaseConfig
      */
-    public function setUp()
-    {
+    public function setUp() {
         global $databaseConfig;
         DB::connect($databaseConfig);
         chdir(BASE_PATH);
@@ -25,16 +23,14 @@ 
     /**
      * @return DNData
      */
-    public function DNData()
-    {
+    public function DNData() {
         return DNData::inst();
     }
 
     /**
      * Do the actual job by calling the appropiate backend
      */
-    public function perform()
-    {
+    public function perform() {
         echo "[-] PingJob starting" . PHP_EOL;
         $log = new DeploynautLogFile($this->args['logfile']);
         $DNProject = $this->DNData()->DNProjectList()->filter('Name', $this->args['projectName'])->First();

code/model/DNBranch.php

Indentation +109 added lines, -109 removed lines

@@ -8,113 +8,113 @@
 class DNBranch extends ViewableData
 {
 
-    /**
-     * @var Gitonomy\Git\Reference\Branch
-     */
-    protected $branch = null;
-
-    /**
-     * @var DNProject
-     */
-    protected $project = null;
-
-    /**
-     * @var DNData
-     */
-    protected $data = null;
-
-    private static $casting = array(
-        'Name' => 'Text',
-        'SHA' => 'Text'
-    );
-
-    /**
-     * @var SS_Datetime
-     */
-    protected $_lastUpdatedCache = '';
-
-    /**
-     * @param DNProject $project
-     * @param DNData $data
-     */
-    public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data)
-    {
-        $this->branch = $branch;
-        $this->project = $project;
-        $this->data = $data;
-    }
-
-    public function __toString()
-    {
-        return $this->Name();
-    }
-
-    /**
-     * @return string
-     */
-    public function Name()
-    {
-        return (string)htmlentities($this->branch->getName());
-    }
-
-    public function Link()
-    {
-        // Use a get-var for branch so that it can handle unsafe chars better
-        return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
-    }
-
-    /**
-     * @return string
-     */
-    public function SHA()
-    {
-        return (string)htmlentities($this->branch->getCommit()->getHash());
-    }
-
-    /**
-     * Provides a DNBuildList of builds found in this project.
-     */
-    public function DNBuildList()
-    {
-        $blockBranch = $this->branch->getName() == 'master' ? null : 'master';
-        return DNReferenceList::create($this->project, $this->data, $this->branch, $blockBranch);
-    }
-
-    /**
-     * @return SS_Datetime
-     */
-    public function LastUpdated()
-    {
-        if ($this->_lastUpdatedCache) {
-            return $this->_lastUpdatedCache;
-        }
-        try {
-            $created = $this->branch->getCommit()->getCommitterDate();
-        } catch (Exception $e) {
-            //occasionally parsing will fail this is a fallback to make it still work
-            return new SS_Datetime();
-        }
-        // gitonomy sets the time to UTC, so now we set the timezone to
-        // whatever PHP is set to (date.timezone). This will change in the future if each
-        // deploynaut user has their own timezone
-
-        $created->setTimezone(new DateTimeZone(date_default_timezone_get()));
-
-        $date = new SS_Datetime();
-        $date->setValue($created->format('Y-m-d H:i:s'));
-        $this->_lastUpdatedCache = $date;
-        return $date;
-    }
-
-    /**
-     * @return string
-     */
-    public function IsOpenByDefault()
-    {
-        if ($this->Name() == 'master') {
-            return " open";
-        } else {
-            return "";
-        }
-    }
+	/**
+	 * @var Gitonomy\Git\Reference\Branch
+	 */
+	protected $branch = null;
+
+	/**
+	 * @var DNProject
+	 */
+	protected $project = null;
+
+	/**
+	 * @var DNData
+	 */
+	protected $data = null;
+
+	private static $casting = array(
+		'Name' => 'Text',
+		'SHA' => 'Text'
+	);
+
+	/**
+	 * @var SS_Datetime
+	 */
+	protected $_lastUpdatedCache = '';
+
+	/**
+	 * @param DNProject $project
+	 * @param DNData $data
+	 */
+	public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data)
+	{
+		$this->branch = $branch;
+		$this->project = $project;
+		$this->data = $data;
+	}
+
+	public function __toString()
+	{
+		return $this->Name();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Name()
+	{
+		return (string)htmlentities($this->branch->getName());
+	}
+
+	public function Link()
+	{
+		// Use a get-var for branch so that it can handle unsafe chars better
+		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function SHA()
+	{
+		return (string)htmlentities($this->branch->getCommit()->getHash());
+	}
+
+	/**
+	 * Provides a DNBuildList of builds found in this project.
+	 */
+	public function DNBuildList()
+	{
+		$blockBranch = $this->branch->getName() == 'master' ? null : 'master';
+		return DNReferenceList::create($this->project, $this->data, $this->branch, $blockBranch);
+	}
+
+	/**
+	 * @return SS_Datetime
+	 */
+	public function LastUpdated()
+	{
+		if ($this->_lastUpdatedCache) {
+			return $this->_lastUpdatedCache;
+		}
+		try {
+			$created = $this->branch->getCommit()->getCommitterDate();
+		} catch (Exception $e) {
+			//occasionally parsing will fail this is a fallback to make it still work
+			return new SS_Datetime();
+		}
+		// gitonomy sets the time to UTC, so now we set the timezone to
+		// whatever PHP is set to (date.timezone). This will change in the future if each
+		// deploynaut user has their own timezone
+
+		$created->setTimezone(new DateTimeZone(date_default_timezone_get()));
+
+		$date = new SS_Datetime();
+		$date->setValue($created->format('Y-m-d H:i:s'));
+		$this->_lastUpdatedCache = $date;
+		return $date;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function IsOpenByDefault()
+	{
+		if ($this->Name() == 'master') {
+			return " open";
+		} else {
+			return "";
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -85,12 +85,12 @@ 
      */
     public function LastUpdated()
     {
-        if ($this->_lastUpdatedCache) {
+        if($this->_lastUpdatedCache) {
             return $this->_lastUpdatedCache;
         }
         try {
             $created = $this->branch->getCommit()->getCommitterDate();
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             //occasionally parsing will fail this is a fallback to make it still work
             return new SS_Datetime();
         }
@@ -111,7 +111,7 @@ 
      */
     public function IsOpenByDefault()
     {
-        if ($this->Name() == 'master') {
+        if($this->Name() == 'master') {
             return " open";
         } else {
             return "";

Braces +9 added lines, -18 removed lines

@@ -5,8 +5,7 @@ 
  *
  * @method string getName()
  */
-class DNBranch extends ViewableData
-{
+class DNBranch extends ViewableData {
 
     /**
      * @var Gitonomy\Git\Reference\Branch
@@ -37,28 +36,24 @@ 
      * @param DNProject $project
      * @param DNData $data
      */
-    public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data)
-    {
+    public function __construct(Gitonomy\Git\Reference\Branch $branch, DNProject $project, DNData $data) {
         $this->branch = $branch;
         $this->project = $project;
         $this->data = $data;
     }
 
-    public function __toString()
-    {
+    public function __toString() {
         return $this->Name();
     }
 
     /**
      * @return string
      */
-    public function Name()
-    {
+    public function Name() {
         return (string)htmlentities($this->branch->getName());
     }
 
-    public function Link()
-    {
+    public function Link() {
         // Use a get-var for branch so that it can handle unsafe chars better
         return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
     }
@@ -66,16 +61,14 @@ 
     /**
      * @return string
      */
-    public function SHA()
-    {
+    public function SHA() {
         return (string)htmlentities($this->branch->getCommit()->getHash());
     }
 
     /**
      * Provides a DNBuildList of builds found in this project.
      */
-    public function DNBuildList()
-    {
+    public function DNBuildList() {
         $blockBranch = $this->branch->getName() == 'master' ? null : 'master';
         return DNReferenceList::create($this->project, $this->data, $this->branch, $blockBranch);
     }
@@ -83,8 +76,7 @@ 
     /**
      * @return SS_Datetime
      */
-    public function LastUpdated()
-    {
+    public function LastUpdated() {
         if ($this->_lastUpdatedCache) {
             return $this->_lastUpdatedCache;
         }
@@ -109,8 +101,7 @@ 
     /**
      * @return string
      */
-    public function IsOpenByDefault()
-    {
+    public function IsOpenByDefault() {
         if ($this->Name() == 'master') {
             return " open";
         } else {

code/model/DNBranchList.php

Indentation +116 added lines, -116 removed lines

@@ -6,120 +6,120 @@
 class DNBranchList extends ArrayList
 {
 
-    /**
-     * @var string
-     */
-    protected static $refs_dir = '';
-
-    /**
-     * @var bool
-     */
-    protected $loaded = false;
-
-    /**
-     * @var array
-     */
-    protected $builds = array();
-
-    /**
-     * @var DNProject
-     */
-    protected $project;
-
-    /**
-     * @var DNData
-     */
-    protected $data;
-
-    public static function set_refs_dir($refsDir)
-    {
-        self::$refs_dir = $refsDir;
-    }
-
-    public static function get_refs_dir()
-    {
-        return self::$refs_dir;
-    }
-
-    /**
-     * @param DNProject $project
-     * @param DNData $data
-     */
-    public function __construct(DNProject $project, DNData $data)
-    {
-        $this->project = $project;
-        $this->data = $data;
-        parent::__construct(array());
-    }
-
-    /**
-     * @return array
-     */
-    protected function getReferences()
-    {
-        $branches = array();
-        // Placeholder to put master branch first
-        $firstBranch = null;
-
-        try {
-            $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
-            return $branches;
-        }
-
-        foreach ($repository->getReferences()->getBranches() as $branch) {
-            /** @var DNBranch $obj */
-            $obj = DNBranch::create($branch, $this->project, $this->data);
-            if ($branch->getName() == 'master') {
-                $firstBranch = array($branch->getName() => $obj);
-            } else {
-                $branches[$branch->getName()] = $obj;
-            }
-        }
-        if ($firstBranch) {
-            $branches = $firstBranch + $branches;
-        }
-
-        return $branches;
-    }
-
-    /**
-     * Find a branch in this set by branch name.
-     *
-     * @param $name
-     *
-     * @return string
-     */
-    public function byName($name)
-    {
-        if ($this->loaded === false) {
-            $this->getIterator();
-        }
-
-        if (isset($this->items[$name])) {
-            return $this->items[$name];
-        }
-
-        return '';
-    }
-
-    /**
-     * Returns an Iterator for this ArrayList.
-     * This function allows you to use ArrayList in foreach loops
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        if ($this->loaded === false) {
-            $this->items = $this->getReferences();
-            $this->loaded = true;
-        }
-        foreach ($this->items as $i => $item) {
-            if (is_array($item)) {
-                $this->items[$i] = new ArrayData($item);
-            }
-        }
-        return new ArrayIterator($this->items);
-    }
+	/**
+	 * @var string
+	 */
+	protected static $refs_dir = '';
+
+	/**
+	 * @var bool
+	 */
+	protected $loaded = false;
+
+	/**
+	 * @var array
+	 */
+	protected $builds = array();
+
+	/**
+	 * @var DNProject
+	 */
+	protected $project;
+
+	/**
+	 * @var DNData
+	 */
+	protected $data;
+
+	public static function set_refs_dir($refsDir)
+	{
+		self::$refs_dir = $refsDir;
+	}
+
+	public static function get_refs_dir()
+	{
+		return self::$refs_dir;
+	}
+
+	/**
+	 * @param DNProject $project
+	 * @param DNData $data
+	 */
+	public function __construct(DNProject $project, DNData $data)
+	{
+		$this->project = $project;
+		$this->data = $data;
+		parent::__construct(array());
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getReferences()
+	{
+		$branches = array();
+		// Placeholder to put master branch first
+		$firstBranch = null;
+
+		try {
+			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
+		} catch (Exception $e) {
+			return $branches;
+		}
+
+		foreach ($repository->getReferences()->getBranches() as $branch) {
+			/** @var DNBranch $obj */
+			$obj = DNBranch::create($branch, $this->project, $this->data);
+			if ($branch->getName() == 'master') {
+				$firstBranch = array($branch->getName() => $obj);
+			} else {
+				$branches[$branch->getName()] = $obj;
+			}
+		}
+		if ($firstBranch) {
+			$branches = $firstBranch + $branches;
+		}
+
+		return $branches;
+	}
+
+	/**
+	 * Find a branch in this set by branch name.
+	 *
+	 * @param $name
+	 *
+	 * @return string
+	 */
+	public function byName($name)
+	{
+		if ($this->loaded === false) {
+			$this->getIterator();
+		}
+
+		if (isset($this->items[$name])) {
+			return $this->items[$name];
+		}
+
+		return '';
+	}
+
+	/**
+	 * Returns an Iterator for this ArrayList.
+	 * This function allows you to use ArrayList in foreach loops
+	 *
+	 * @return ArrayIterator
+	 */
+	public function getIterator()
+	{
+		if ($this->loaded === false) {
+			$this->items = $this->getReferences();
+			$this->loaded = true;
+		}
+		foreach ($this->items as $i => $item) {
+			if (is_array($item)) {
+				$this->items[$i] = new ArrayData($item);
+			}
+		}
+		return new ArrayIterator($this->items);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -63,20 +63,20 @@ 
 
         try {
             $repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             return $branches;
         }
 
-        foreach ($repository->getReferences()->getBranches() as $branch) {
+        foreach($repository->getReferences()->getBranches() as $branch) {
             /** @var DNBranch $obj */
             $obj = DNBranch::create($branch, $this->project, $this->data);
-            if ($branch->getName() == 'master') {
+            if($branch->getName() == 'master') {
                 $firstBranch = array($branch->getName() => $obj);
             } else {
                 $branches[$branch->getName()] = $obj;
             }
         }
-        if ($firstBranch) {
+        if($firstBranch) {
             $branches = $firstBranch + $branches;
         }
 
@@ -92,11 +92,11 @@ 
      */
     public function byName($name)
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->getIterator();
         }
 
-        if (isset($this->items[$name])) {
+        if(isset($this->items[$name])) {
             return $this->items[$name];
         }
 
@@ -111,12 +111,12 @@ 
      */
     public function getIterator()
     {
-        if ($this->loaded === false) {
+        if($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;
         }
-        foreach ($this->items as $i => $item) {
-            if (is_array($item)) {
+        foreach($this->items as $i => $item) {
+            if(is_array($item)) {
                 $this->items[$i] = new ArrayData($item);
             }
         }

Braces +7 added lines, -14 removed lines

@@ -3,8 +3,7 @@ 
 /**
  * Class DNBranchList
  */
-class DNBranchList extends ArrayList
-{
+class DNBranchList extends ArrayList {
 
     /**
      * @var string
@@ -31,13 +30,11 @@ 
      */
     protected $data;
 
-    public static function set_refs_dir($refsDir)
-    {
+    public static function set_refs_dir($refsDir) {
         self::$refs_dir = $refsDir;
     }
 
-    public static function get_refs_dir()
-    {
+    public static function get_refs_dir() {
         return self::$refs_dir;
     }
 
@@ -45,8 +42,7 @@ 
      * @param DNProject $project
      * @param DNData $data
      */
-    public function __construct(DNProject $project, DNData $data)
-    {
+    public function __construct(DNProject $project, DNData $data) {
         $this->project = $project;
         $this->data = $data;
         parent::__construct(array());
@@ -55,8 +51,7 @@ 
     /**
      * @return array
      */
-    protected function getReferences()
-    {
+    protected function getReferences() {
         $branches = array();
         // Placeholder to put master branch first
         $firstBranch = null;
@@ -90,8 +85,7 @@ 
      *
      * @return string
      */
-    public function byName($name)
-    {
+    public function byName($name) {
         if ($this->loaded === false) {
             $this->getIterator();
         }
@@ -109,8 +103,7 @@ 
      *
      * @return ArrayIterator
      */
-    public function getIterator()
-    {
+    public function getIterator() {
         if ($this->loaded === false) {
             $this->items = $this->getReferences();
             $this->loaded = true;