Completed
Push — master ( bd1769...dc246b )
by Niels
03:23
created
src/DirectAdmin/Utility/Conversion.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     {
40 40
         $ukey = "u{$key}";
41 41
         unset($options[$ukey]);
42
-        if (array_key_exists($key, $options) && ($options[$key] === 'unlimited' || !isset($options[$key]))) {
42
+        if(array_key_exists($key, $options) && ($options[$key] === 'unlimited' || !isset($options[$key]))) {
43 43
             $options[$ukey] = 'ON';
44 44
         }
45 45
     }
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public static function processUnlimitedOptions(array $options)
54 54
     {
55
-        foreach (['bandwidth', 'domainptr', 'ftp', 'mysql', 'nemailf', 'nemailml', 'nemailr', 'nemails',
55
+        foreach(['bandwidth', 'domainptr', 'ftp', 'mysql', 'nemailf', 'nemailml', 'nemailr', 'nemails',
56 56
                     'nsubdomains', 'quota', 'vdomains', ] as $key) {
57 57
             self::processUnlimitedOption($options, $key);
58 58
         }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
      */
68 68
     public static function responseToArray($data)
69 69
     {
70
-        $unescaped = preg_replace_callback('/&#([0-9]{2})/', function ($val) {
70
+        $unescaped = preg_replace_callback('/&#([0-9]{2})/', function($val) {
71 71
             return chr($val[1]);
72 72
         }, $data);
73 73
         return \GuzzleHttp\Psr7\parse_query($unescaped);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      */
82 82
     public static function sanitizeArray($result)
83 83
     {
84
-        if (count($result) == 1 && isset($result['list[]'])) {
84
+        if(count($result) == 1 && isset($result['list[]'])) {
85 85
             $result = $result['list[]'];
86 86
         }
87 87
         return is_array($result) ? $result : [$result];
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@  discard block
 block discarded – undo
39 39
     {
40 40
         $ukey = "u{$key}";
41 41
         unset($options[$ukey]);
42
-        if (array_key_exists($key, $options) && ($options[$key] === 'unlimited' || !isset($options[$key]))) {
42
+        if (array_key_exists($key, $options) && ($options[$key] === 'unlimited' || !isset($options[$key])))
43
+        {
43 44
             $options[$ukey] = 'ON';
44 45
         }
45 46
     }
@@ -53,7 +54,8 @@  discard block
 block discarded – undo
53 54
     public static function processUnlimitedOptions(array $options)
54 55
     {
55 56
         foreach (['bandwidth', 'domainptr', 'ftp', 'mysql', 'nemailf', 'nemailml', 'nemailr', 'nemails',
56
-                    'nsubdomains', 'quota', 'vdomains', ] as $key) {
57
+                    'nsubdomains', 'quota', 'vdomains', ] as $key)
58
+        {
57 59
             self::processUnlimitedOption($options, $key);
58 60
         }
59 61
         return $options;
@@ -81,7 +83,8 @@  discard block
 block discarded – undo
81 83
      */
82 84
     public static function sanitizeArray($result)
83 85
     {
84
-        if (count($result) == 1 && isset($result['list[]'])) {
86
+        if (count($result) == 1 && isset($result['list[]']))
87
+        {
85 88
             $result = $result['list[]'];
86 89
         }
87 90
         return is_array($result) ? $result : [$result];
Please login to merge, or discard this patch.
src/DirectAdmin/DirectAdmin.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
     public function invoke($method, $command, $options = [])
128 128
     {
129 129
         $result = $this->rawRequest($method, '/CMD_API_' . $command, $options);
130
-        if (!empty($result['error'])) {
130
+        if(!empty($result['error'])) {
131 131
             throw new DirectAdminException("$method to $command failed: $result[details] ($result[text])");
132 132
         }
133 133
         return Conversion::sanitizeArray($result);
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
157 157
     {
158 158
         try {
159 159
             $response = $this->connection->request($method, $uri, $options);
160
-            if ($response->getHeader('Content-Type')[0] == 'text/html') {
160
+            if($response->getHeader('Content-Type')[0] == 'text/html') {
161 161
                 throw new DirectAdminException("DirectAdmin API returned a text/html body. Requested {$uri} via {$method}. Responded: " . strip_tags($response->getBody()->getContents()));
162 162
             }
163 163
             $body = $response->getBody()->getContents();
164 164
             return Conversion::responseToArray($body);
165
-        } catch (TransferException $exception) {
165
+        } catch(TransferException $exception) {
166 166
             // Rethrow anything that causes a network issue
167 167
             throw new DirectAdminException("Request to {$uri} using {$method} failed", 0, $exception);
168 168
         }
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -127,7 +127,8 @@  discard block
 block discarded – undo
127 127
     public function invoke($method, $command, $options = [])
128 128
     {
129 129
         $result = $this->rawRequest($method, '/CMD_API_' . $command, $options);
130
-        if (!empty($result['error'])) {
130
+        if (!empty($result['error']))
131
+        {
131 132
             throw new DirectAdminException("$method to $command failed: $result[details] ($result[text])");
132 133
         }
133 134
         return Conversion::sanitizeArray($result);
@@ -155,14 +156,18 @@  discard block
 block discarded – undo
155 156
      */
156 157
     private function rawRequest($method, $uri, $options)
157 158
     {
158
-        try {
159
+        try
160
+        {
159 161
             $response = $this->connection->request($method, $uri, $options);
160
-            if ($response->getHeader('Content-Type')[0] == 'text/html') {
162
+            if ($response->getHeader('Content-Type')[0] == 'text/html')
163
+            {
161 164
                 throw new DirectAdminException("DirectAdmin API returned a text/html body. Requested {$uri} via {$method}. Responded: " . strip_tags($response->getBody()->getContents()));
162 165
             }
163 166
             $body = $response->getBody()->getContents();
164 167
             return Conversion::responseToArray($body);
165
-        } catch (TransferException $exception) {
168
+        }
169
+        catch (TransferException $exception)
170
+        {
166 171
             // Rethrow anything that causes a network issue
167 172
             throw new DirectAdminException("Request to {$uri} using {$method} failed", 0, $exception);
168 173
         }
Please login to merge, or discard this patch.
src/DirectAdmin/Objects/BaseObject.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      */
57 57
     protected function getCache($key, $default)
58 58
     {
59
-        if (!isset($this->cache[$key])) {
59
+        if(!isset($this->cache[$key])) {
60 60
             $this->cache[$key] = is_callable($default) ? $default() : $default;
61 61
         }
62 62
         return $this->cache[$key];
@@ -73,10 +73,10 @@  discard block
 block discarded – undo
73 73
      */
74 74
     protected function getCacheItem($key, $item, $defaultKey, $defaultItem = null)
75 75
     {
76
-        if (empty($cache = $this->getCache($key, $defaultKey))) {
76
+        if(empty($cache = $this->getCache($key, $defaultKey))) {
77 77
             return $defaultItem;
78 78
         }
79
-        if (!is_array($cache)) {
79
+        if(!is_array($cache)) {
80 80
             throw new DirectAdminException("Cache item $key is not an array");
81 81
         }
82 82
         return isset($cache[$item]) ? $cache[$item] : $defaultItem;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
      */
122 122
     public static function toObjectArray(array $items, $class, UserContext $context)
123 123
     {
124
-        return array_combine($items, array_map(function ($item) use ($class, $context) {
124
+        return array_combine($items, array_map(function($item) use ($class, $context) {
125 125
             return new $class($item, $context);
126 126
         }, $items));
127 127
     }
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
      */
137 137
     public static function toRichObjectArray(array $items, $class, UserContext $context)
138 138
     {
139
-        array_walk($items, function (&$value, $name) use ($class, $context) {
139
+        array_walk($items, function(&$value, $name) use ($class, $context) {
140 140
             $value = new $class($name, $context, $value);
141 141
         });
142 142
         return $items;
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,7 +56,8 @@  discard block
 block discarded – undo
56 56
      */
57 57
     protected function getCache($key, $default)
58 58
     {
59
-        if (!isset($this->cache[$key])) {
59
+        if (!isset($this->cache[$key]))
60
+        {
60 61
             $this->cache[$key] = is_callable($default) ? $default() : $default;
61 62
         }
62 63
         return $this->cache[$key];
@@ -73,10 +74,12 @@  discard block
 block discarded – undo
73 74
      */
74 75
     protected function getCacheItem($key, $item, $defaultKey, $defaultItem = null)
75 76
     {
76
-        if (empty($cache = $this->getCache($key, $defaultKey))) {
77
+        if (empty($cache = $this->getCache($key, $defaultKey)))
78
+        {
77 79
             return $defaultItem;
78 80
         }
79
-        if (!is_array($cache)) {
81
+        if (!is_array($cache))
82
+        {
80 83
             throw new DirectAdminException("Cache item $key is not an array");
81 84
         }
82 85
         return isset($cache[$item]) ? $cache[$item] : $defaultItem;
Please login to merge, or discard this patch.