@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | parent::__construct($st, $args); |
68 | 68 | |
69 | 69 | // $args[0] should be our provisioning block |
70 | - if (!isset($args[0]) || ! $args[0] instanceof ProvisioningDefinition) { |
|
70 | + if (!isset($args[0]) || !$args[0] instanceof ProvisioningDefinition) { |
|
71 | 71 | throw new E5xx_ActionFailed(__METHOD__, "Param #0 must be a ProvisioningDefinition object"); |
72 | 72 | } |
73 | 73 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | }; |
112 | 112 | |
113 | 113 | // build our return object |
114 | - $return = new DelayedProvisioningDefinitionAction ( |
|
114 | + $return = new DelayedProvisioningDefinitionAction( |
|
115 | 115 | $this->args[0], |
116 | 116 | $action |
117 | 117 | ); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | }; |
145 | 145 | |
146 | 146 | // build our return object |
147 | - $return = new DelayedProvisioningDefinitionAction ( |
|
147 | + $return = new DelayedProvisioningDefinitionAction( |
|
148 | 148 | $this->args[0], |
149 | 149 | $action |
150 | 150 | ); |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | }; |
174 | 174 | |
175 | 175 | // build our return object |
176 | - $return = new DelayedProvisioningDefinitionAction ( |
|
176 | + $return = new DelayedProvisioningDefinitionAction( |
|
177 | 177 | $this->args[0], |
178 | 178 | $action |
179 | 179 | ); |
@@ -77,8 +77,7 @@ |
||
77 | 77 | |
78 | 78 | return $return; |
79 | 79 | } |
80 | - catch (Exception $e) |
|
81 | - { |
|
80 | + catch (Exception $e) { |
|
82 | 81 | throw new E5xx_ActionFailed(__METHOD__, $e->getMessage()); |
83 | 82 | } |
84 | 83 | } |
@@ -84,7 +84,7 @@ |
||
84 | 84 | "-o UserKnownHostsFile=/dev/null", |
85 | 85 | "-o LogLevel=quiet", |
86 | 86 | ]; |
87 | - $vmDetails->scpOptions = [ |
|
87 | + $vmDetails->scpOptions = [ |
|
88 | 88 | "-i '" . $vmDetails->sshKeyFile . "'", |
89 | 89 | "-o StrictHostKeyChecking=no", |
90 | 90 | ]; |
@@ -115,8 +115,7 @@ |
||
115 | 115 | getenv("HOME") . "/.vagrant.d/insecure_private_key" |
116 | 116 | ]; |
117 | 117 | |
118 | - foreach ($keyFilenames as $keyFilename) |
|
119 | - { |
|
118 | + foreach ($keyFilenames as $keyFilename) { |
|
120 | 119 | usingLog()->writeToLog("checking if {$keyFilename} exists"); |
121 | 120 | if (file_exists($keyFilename)) { |
122 | 121 | $log->endAction($keyFilename); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | protected $host; |
63 | 63 | protected $zk; |
64 | 64 | |
65 | - protected $default_acl = array( array( |
|
65 | + protected $default_acl = array(array( |
|
66 | 66 | "perms" => Zookeeper::PERM_ALL, |
67 | 67 | "scheme" => "world", |
68 | 68 | "id" => "anyone" |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | // drop the last part, as that is the key itself |
120 | - unset($parts[count($parts) -1]); |
|
120 | + unset($parts[count($parts) - 1]); |
|
121 | 121 | |
122 | 122 | // start with an empty path |
123 | - $path = ''; |
|
123 | + $path = ''; |
|
124 | 124 | |
125 | 125 | // work through the parts, building up the path to create from |
126 | 126 | // the root of the directory |
@@ -124,16 +124,14 @@ discard block |
||
124 | 124 | |
125 | 125 | // work through the parts, building up the path to create from |
126 | 126 | // the root of the directory |
127 | - foreach ($parts as $part) |
|
128 | - { |
|
127 | + foreach ($parts as $part) { |
|
129 | 128 | // expand our path to the next part |
130 | 129 | $path .= '/' . $part; |
131 | 130 | |
132 | 131 | // does this path exist? |
133 | 132 | if (!$this->zk->exists($path)) { |
134 | 133 | // no - create it |
135 | - if (!$this->zk->create($path, 1, $this->default_acl)) |
|
136 | - { |
|
134 | + if (!$this->zk->create($path, 1, $this->default_acl)) { |
|
137 | 135 | // failed to create the entry |
138 | 136 | throw Exceptions::newActionFailedException(__METHOD__); |
139 | 137 | } |
@@ -151,8 +149,9 @@ discard block |
||
151 | 149 | |
152 | 150 | // now we can safely set the key itself |
153 | 151 | if (!$this->zk->exists($key)) { |
154 | - if (!$this->zk->create($key, $value, $this->default_acl)) |
|
155 | - throw Exceptions::newActionFailedException(__METHOD__); |
|
152 | + if (!$this->zk->create($key, $value, $this->default_acl)) { |
|
153 | + throw Exceptions::newActionFailedException(__METHOD__); |
|
154 | + } |
|
156 | 155 | } |
157 | 156 | else if (!$this->zk->set($key, $value)) { |
158 | 157 | throw Exceptions::newActionFailedException(__METHOD__); |
@@ -61,75 +61,75 @@ |
||
61 | 61 | |
62 | 62 | class Dsbuild_Adapter implements ProvisioningAdapter |
63 | 63 | { |
64 | - public function __construct() |
|
65 | - { |
|
66 | - $this->setExecutePath(getcwd() . DIRECTORY_SEPARATOR . "dsbuild.sh"); |
|
67 | - } |
|
68 | - |
|
69 | - // ================================================================== |
|
70 | - // |
|
71 | - // Support for executing the script |
|
72 | - // |
|
73 | - // ------------------------------------------------------------------ |
|
74 | - |
|
75 | - /** |
|
76 | - * where is the script that we are going to execute? |
|
77 | - * |
|
78 | - * @var string |
|
79 | - */ |
|
80 | - protected $executePath; |
|
81 | - |
|
82 | - /** |
|
83 | - * which folder are we executing things in? |
|
84 | - * |
|
85 | - * @return string |
|
86 | - */ |
|
87 | - public function getExecuteDir() |
|
88 | - { |
|
89 | - return dirname($this->executePath); |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * where is the script that we are going to execute? |
|
94 | - * |
|
95 | - * @return string |
|
96 | - */ |
|
97 | - public function getExecutePath() |
|
98 | - { |
|
99 | - return $this->executePath; |
|
100 | - } |
|
101 | - |
|
102 | - /** |
|
103 | - * tell me which script to execute |
|
104 | - * |
|
105 | - * @param string $path |
|
106 | - * path to the dsbuild script |
|
107 | - */ |
|
108 | - public function setExecutePath($path) |
|
109 | - { |
|
110 | - $this->executePath = $path; |
|
111 | - |
|
112 | - return $this; |
|
113 | - } |
|
114 | - |
|
115 | - // ================================================================== |
|
116 | - // |
|
117 | - // SPv2.0-style config support |
|
118 | - // |
|
119 | - // ------------------------------------------------------------------ |
|
120 | - |
|
121 | - public function getAsConfig() |
|
122 | - { |
|
123 | - // our return value |
|
124 | - $retval = new BaseObject; |
|
125 | - |
|
126 | - // this is who we are |
|
127 | - $retval->engine = "dsbuild"; |
|
128 | - |
|
129 | - // this is what needs running |
|
130 | - $retval->execute = $this->getExecutePath(); |
|
131 | - |
|
132 | - // all done |
|
133 | - return $retval; |
|
134 | - } |
|
64 | + public function __construct() |
|
65 | + { |
|
66 | + $this->setExecutePath(getcwd() . DIRECTORY_SEPARATOR . "dsbuild.sh"); |
|
67 | + } |
|
68 | + |
|
69 | + // ================================================================== |
|
70 | + // |
|
71 | + // Support for executing the script |
|
72 | + // |
|
73 | + // ------------------------------------------------------------------ |
|
74 | + |
|
75 | + /** |
|
76 | + * where is the script that we are going to execute? |
|
77 | + * |
|
78 | + * @var string |
|
79 | + */ |
|
80 | + protected $executePath; |
|
81 | + |
|
82 | + /** |
|
83 | + * which folder are we executing things in? |
|
84 | + * |
|
85 | + * @return string |
|
86 | + */ |
|
87 | + public function getExecuteDir() |
|
88 | + { |
|
89 | + return dirname($this->executePath); |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * where is the script that we are going to execute? |
|
94 | + * |
|
95 | + * @return string |
|
96 | + */ |
|
97 | + public function getExecutePath() |
|
98 | + { |
|
99 | + return $this->executePath; |
|
100 | + } |
|
101 | + |
|
102 | + /** |
|
103 | + * tell me which script to execute |
|
104 | + * |
|
105 | + * @param string $path |
|
106 | + * path to the dsbuild script |
|
107 | + */ |
|
108 | + public function setExecutePath($path) |
|
109 | + { |
|
110 | + $this->executePath = $path; |
|
111 | + |
|
112 | + return $this; |
|
113 | + } |
|
114 | + |
|
115 | + // ================================================================== |
|
116 | + // |
|
117 | + // SPv2.0-style config support |
|
118 | + // |
|
119 | + // ------------------------------------------------------------------ |
|
120 | + |
|
121 | + public function getAsConfig() |
|
122 | + { |
|
123 | + // our return value |
|
124 | + $retval = new BaseObject; |
|
125 | + |
|
126 | + // this is who we are |
|
127 | + $retval->engine = "dsbuild"; |
|
128 | + |
|
129 | + // this is what needs running |
|
130 | + $retval->execute = $this->getExecutePath(); |
|
131 | + |
|
132 | + // all done |
|
133 | + return $retval; |
|
134 | + } |
|
135 | 135 | } |
136 | 136 | \ No newline at end of file |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function getBaseFolder(); |
69 | 69 | |
70 | - /** |
|
71 | - * how do we validate any host adapters used by hosts in this group? |
|
72 | - * |
|
73 | - * @return HostAdapterValidator |
|
74 | - */ |
|
75 | - public function getHostAdapterValidator(); |
|
70 | + /** |
|
71 | + * how do we validate any host adapters used by hosts in this group? |
|
72 | + * |
|
73 | + * @return HostAdapterValidator |
|
74 | + */ |
|
75 | + public function getHostAdapterValidator(); |
|
76 | 76 | |
77 | 77 | /** |
78 | 78 | * what type of group are we? |
@@ -82,5 +82,5 @@ discard block |
||
82 | 82 | * |
83 | 83 | * @return string |
84 | 84 | */ |
85 | - public function getType(); |
|
85 | + public function getType(); |
|
86 | 86 | } |
87 | 87 | \ No newline at end of file |
@@ -61,15 +61,15 @@ |
||
61 | 61 | |
62 | 62 | interface HostAdapter |
63 | 63 | { |
64 | - /** |
|
65 | - * create an empty host definition for this kind of host |
|
66 | - * |
|
67 | - * @param TestEnvironment_GroupDefinition $groupDef |
|
68 | - * the group that we belong to |
|
69 | - * @param string $hostId |
|
70 | - * the alias for this host |
|
71 | - * @return object |
|
72 | - * a host definition to populate |
|
73 | - */ |
|
74 | - public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId); |
|
64 | + /** |
|
65 | + * create an empty host definition for this kind of host |
|
66 | + * |
|
67 | + * @param TestEnvironment_GroupDefinition $groupDef |
|
68 | + * the group that we belong to |
|
69 | + * @param string $hostId |
|
70 | + * the alias for this host |
|
71 | + * @return object |
|
72 | + * a host definition to populate |
|
73 | + */ |
|
74 | + public function newHostDefinition(TestEnvironment_GroupDefinition $groupDef, $hostId); |
|
75 | 75 | } |
76 | 76 | \ No newline at end of file |
@@ -59,13 +59,13 @@ |
||
59 | 59 | |
60 | 60 | interface HostAdapterValidator |
61 | 61 | { |
62 | - /** |
|
63 | - * check to make sure that a host adapter plugin is compatible with |
|
64 | - * the group adapter |
|
65 | - * |
|
66 | - * @param HostAdapter $hostAdapter |
|
67 | - * the adapter to validate |
|
68 | - * @return void |
|
69 | - */ |
|
70 | - public function validate(HostAdapter $hostAdapter); |
|
62 | + /** |
|
63 | + * check to make sure that a host adapter plugin is compatible with |
|
64 | + * the group adapter |
|
65 | + * |
|
66 | + * @param HostAdapter $hostAdapter |
|
67 | + * the adapter to validate |
|
68 | + * @return void |
|
69 | + */ |
|
70 | + public function validate(HostAdapter $hostAdapter); |
|
71 | 71 | } |
72 | 72 | \ No newline at end of file |
@@ -60,11 +60,11 @@ |
||
60 | 60 | interface OsAdapter |
61 | 61 | { |
62 | 62 | |
63 | - // ================================================================== |
|
64 | - // |
|
65 | - // Temporary features which will be removed in SP2.4 go here |
|
66 | - // |
|
67 | - // ------------------------------------------------------------------ |
|
63 | + // ================================================================== |
|
64 | + // |
|
65 | + // Temporary features which will be removed in SP2.4 go here |
|
66 | + // |
|
67 | + // ------------------------------------------------------------------ |
|
68 | 68 | |
69 | 69 | /** |
70 | 70 | * what is our operating system name? |