Completed
Push — work-fleets ( 60e3d3...5fa106 )
by SuperNova.WS
06:18
created
tests.int/FleetTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 define('SN_IN_FLEET', true);
6 6
 define('SN_RENDER_NAVBAR_PLANET', true);
7 7
 
8
-include('../common.' . substr(strrchr(__FILE__, '.'), 1));
8
+include('../common.'.substr(strrchr(__FILE__, '.'), 1));
9 9
 
10 10
 // TODO - Переместить это куда-нибудь
11 11
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
@@ -162,17 +162,17 @@  discard block
 block discarded – undo
162 162
 //  break;
163 163
     }
164 164
 
165
-    if($exceptionCode !== null) {
166
-      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</span><br />');
165
+    if ($exceptionCode !== null) {
166
+      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</span><br />');
167 167
     } else {
168 168
       print('Passed');
169 169
     }
170 170
   } catch (Exception $e) {
171 171
     if ($exceptionCode !== null && $e->getCode() === $exceptionCode) {
172
-      print('<span style="color: darkgreen;">Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - passed</span><br />');
172
+      print('<span style="color: darkgreen;">Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - passed</span><br />');
173 173
     } else {
174
-      print('<div style="color: red; font-size: 200%;">Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</div>');
175
-      print('<div style="color: red; font-size: 200%;">Got Exception [' . $e->getCode() . ']: "' . $e->getMessage() . '"/"' . classLocale::$lang['fl_attack_error'][$e->getCode()] . '" . "</div>');
174
+      print('<div style="color: red; font-size: 200%;">Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</div>');
175
+      print('<div style="color: red; font-size: 200%;">Got Exception ['.$e->getCode().']: "'.$e->getMessage().'"/"'.classLocale::$lang['fl_attack_error'][$e->getCode()].'" . "</div>');
176 176
       throw $e;
177 177
     }
178 178
   }
Please login to merge, or discard this patch.
includes/classes/SnCache.php 2 patches
Doc Comments   +24 added lines patch added patch discarded remove patch
@@ -121,6 +121,9 @@  discard block
 block discarded – undo
121 121
     }
122 122
   }
123 123
 
124
+  /**
125
+   * @param string $filter
126
+   */
124 127
   public static function queryCacheSetByFilter($location_type, $filter, $record_id) {
125 128
     SnCache::$queries[$location_type][$filter][$record_id] = &SnCache::getDataRefByLocationAndId($location_type, $record_id);
126 129
   }
@@ -160,14 +163,23 @@  discard block
 block discarded – undo
160 163
     return true; // Не всегда - от результата
161 164
   }
162 165
 
166
+  /**
167
+   * @param integer $locationType
168
+   */
163 169
   public static function getData($locationType = LOC_NONE) {
164 170
     return $locationType == LOC_NONE ? static::$data : static::$data[$locationType];
165 171
   }
166 172
 
173
+  /**
174
+   * @param integer $locationType
175
+   */
167 176
   public static function cacheUnsetElement($locationType, $recordId) {
168 177
     static::$data[$locationType][$recordId] = null;
169 178
   }
170 179
 
180
+  /**
181
+   * @param integer $locationType
182
+   */
171 183
   public static function isArrayLocation($locationType) {
172 184
     return is_array(static::$data[$locationType]);
173 185
   }
@@ -190,6 +202,9 @@  discard block
 block discarded – undo
190 202
     }
191 203
   }
192 204
 
205
+  /**
206
+   * @param integer $unit_snid
207
+   */
193 208
   public static function getUnitLocator($location_type, $location_id, $unit_snid) {
194 209
     return $unit_snid ? static::$locator[LOC_UNIT][$location_type][$location_id][$unit_snid] : static::$locator[LOC_UNIT][$location_type][$location_id];
195 210
   }
@@ -222,14 +237,23 @@  discard block
 block discarded – undo
222 237
     return static::$locks;
223 238
   }
224 239
 
240
+  /**
241
+   * @param string $filter
242
+   */
225 243
   public static function getQueriesByLocationAndFilter($locationType, $filter) {
226 244
     return !empty(static::$queries[$locationType][$filter]) && is_array(static::$queries[$locationType][$filter]) ? static::$queries[$locationType][$filter] : array();
227 245
   }
228 246
 
247
+  /**
248
+   * @param string $filter
249
+   */
229 250
   public static function isQueryCacheByLocationAndFilterEmpty($locationType, $filter) {
230 251
     return !isset(SnCache::$queries[$locationType][$filter]) || SnCache::$queries[$locationType][$filter] === null;
231 252
   }
232 253
 
254
+  /**
255
+   * @param string $filter
256
+   */
233 257
   public static function queryCacheResetByLocationAndFilter($locationType, $filter) {
234 258
     SnCache::$queries[$locationType][$filter] = array();
235 259
   }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
     if ($hard && !empty(static::$data[$location_type])) {
60 60
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
61 61
       // TODO - replace with setNull
62
-      array_walk(static::$data[$location_type], function (&$item) { $item = null; });
62
+      array_walk(static::$data[$location_type], function(&$item) { $item = null; });
63 63
     }
64 64
     static::$locator[$location_type] = array();
65 65
     static::$queries[$location_type] = array();
Please login to merge, or discard this patch.