Completed
Push — master ( 6e62ff...a5d74c )
by Jakub
02:45
created
src/SkillSpecial.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
     });
75 75
     $resolver->setAllowedTypes("stat", ["string", "null"]);
76 76
     $resolver->setAllowedValues("stat", function(?string $value) {
77
-      return is_null($value) OR in_array($value, $this->getAllowedStats(), true);
77
+      return is_null($value) or in_array($value, $this->getAllowedStats(), true);
78 78
     });
79 79
     $resolver->setAllowedTypes("value", "integer");
80 80
     $resolver->setAllowedValues("value", function(int $value) {
Please login to merge, or discard this patch.
src/Equipment.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
     });
62 62
     $resolver->setAllowedTypes("type", ["string", "null"]);
63 63
     $resolver->setAllowedValues("type", function(?string $value) {
64
-      return is_null($value) OR in_array($value, $this->getAllowedTypes(), true);
64
+      return is_null($value) or in_array($value, $this->getAllowedTypes(), true);
65 65
     });
66 66
     $resolver->setAllowedTypes("strength", "integer");
67 67
     $resolver->setAllowedValues("strength", function(int $value) {
Please login to merge, or discard this patch.
src/CharacterEffect.php 1 patch
Upper-Lower-Casing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     $resolver->setAllowedTypes("stat", "string");
53 53
     $resolver->setDefault("stat", "");
54 54
     $resolver->setAllowedValues("stat", function(string $value) {
55
-      return $value === "" OR in_array($value, $this->getAllowedStats(), true);
55
+      return $value === "" or in_array($value, $this->getAllowedStats(), true);
56 56
     });
57 57
     $resolver->setAllowedTypes("source", "string");
58 58
     $resolver->setAllowedValues("source", function(string $value) {
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
     $resolver->setDefault("value", 0);
63 63
     $resolver->setAllowedTypes("duration", ["string", "integer"]);
64 64
     $resolver->setAllowedValues("duration", function($value) {
65
-      return (in_array($value, $this->getDurations(), true)) OR ($value > 0);
65
+      return (in_array($value, $this->getDurations(), true)) or ($value > 0);
66 66
     });
67 67
     $effect = $resolver->resolve($effect);
68
-    if(!in_array($effect["type"], SkillSpecial::NO_STAT_TYPES, true) AND $effect["stat"] === "") {
68
+    if(!in_array($effect["type"], SkillSpecial::NO_STAT_TYPES, true) and $effect["stat"] === "") {
69 69
       throw new \InvalidArgumentException("The option stat with value '' is invalid.");
70 70
     }
71 71
     $this->id = $effect["id"];
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
    * @throws \InvalidArgumentException
136 136
    */
137 137
   public function setDuration($value) {
138
-    if(!is_int($value) AND !in_array($value, $this->getDurations(), true)) {
138
+    if(!is_int($value) and !in_array($value, $this->getDurations(), true)) {
139 139
       throw new \InvalidArgumentException("Invalid value set to CharacterEffect::\$duration. Expected string or integer.");
140 140
     }
141 141
     $this->duration = $value;
Please login to merge, or discard this patch.
src/CharacterAttackSkill.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
   }
39 39
   
40 40
   public function getHitRate(): int {
41
-    if(is_string($this->skill->hitRate) AND substr($this->skill->hitRate, -1) === "%") {
41
+    if(is_string($this->skill->hitRate) and substr($this->skill->hitRate, -1) === "%") {
42 42
       return (int) $this->skill->hitRate;
43 43
     }
44 44
     return 100;
Please login to merge, or discard this patch.
src/CombatLogger.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
    */
76 76
   public function setTemplate(string $template): void {
77 77
     if(!is_file($template)) {
78
-      throw new \RuntimeException("File $template does not exist.");
78
+      throw new \RuntimeException("file $template does not exist.");
79 79
     }
80 80
     $this->template = $template;
81 81
   }
Please login to merge, or discard this patch.
src/Team.php 1 patch
Upper-Lower-Casing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
    */
81 81
   public function setCharacterPosition($id, int $row, int $column): void {
82 82
     if(!$this->hasItems(["id" => $id])) {
83
-      throw new \OutOfBoundsException("Character $id is not in the team");
83
+      throw new \OutOfBoundsException("character $id is not in the team");
84 84
     } elseif(count($this->getItems(["positionRow" => $row])) >= $this->maxRowSize) {
85
-      throw new InvalidCharacterPositionException("Row $row is full.", InvalidCharacterPositionException::ROW_FULL);
85
+      throw new InvalidCharacterPositionException("row $row is full.", InvalidCharacterPositionException::ROW_FULL);
86 86
     } elseif($this->hasItems(["positionRow" => $row, "positionColumn" => $column])) {
87
-      throw new InvalidCharacterPositionException("Row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
87
+      throw new InvalidCharacterPositionException("row $row column $column is occupied.", InvalidCharacterPositionException::POSITION_OCCUPIED);
88 88
     }
89 89
     $character = $this->getItems(["id" => $id])[0];
90 90
     $character->positionRow = $row;
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
       return NULL;
113 113
     }
114 114
     foreach($this->aliveMembers as $index => $member) {
115
-      if($member->hitpoints <= $member->maxHitpoints * $threshold AND $member->hitpoints < $lowestHp) {
115
+      if($member->hitpoints <= $member->maxHitpoints * $threshold and $member->hitpoints < $lowestHp) {
116 116
         $lowestHp = $member->hitpoints;
117 117
         $lowestIndex = $index;
118 118
       }
Please login to merge, or discard this patch.
src/CombatBase.php 1 patch
Upper-Lower-Casing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
       foreach($team as $character) {
227 227
         try {
228 228
           $column++;
229
-          if($character->positionRow > 0 AND $character->positionColumn > 0) {
229
+          if($character->positionRow > 0 and $character->positionColumn > 0) {
230 230
             continue;
231 231
           }
232 232
           setPosition:
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
     $characters = array_merge($combat->team1->toArray(), $combat->team2->toArray());
280 280
     foreach($characters as $character) {
281 281
       foreach($character->effects as $effect) {
282
-        if($effect->duration === CharacterEffect::DURATION_COMBAT OR is_int($effect->duration)) {
282
+        if($effect->duration === CharacterEffect::DURATION_COMBAT or is_int($effect->duration)) {
283 283
           $character->removeEffect($effect->id);
284 284
         }
285 285
       }
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
         $targets = $this->getTeam($primaryTarget)->getItems(["positionColumn" => $primaryTarget->positionColumn]);
383 383
         break;
384 384
       default:
385
-        throw new NotImplementedException("Target $skill->skill->target for attack skills is not implemented.");
385
+        throw new NotImplementedException("target $skill->skill->target for attack skills is not implemented.");
386 386
     }
387 387
     foreach($targets as $target) {
388 388
       for($i = 1; $i <= $skill->skill->strikes; $i++) {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
         $targets = $this->getEnemyTeam($character)->toArray();
408 408
         break;
409 409
       default:
410
-        throw new NotImplementedException("Target $skill->skill->target for special skills is not implemented.");
410
+        throw new NotImplementedException("target $skill->skill->target for special skills is not implemented.");
411 411
     }
412 412
     foreach($targets as $target) {
413 413
       $this->onSkillSpecial($character, $target, $skill);
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
   protected function chooseAction(self $combat, Character $character): ?string {
418 418
     if($character->hitpoints < 1) {
419 419
       return NULL;
420
-    } elseif(in_array($character, $combat->findHealers()->toArray(), true) AND !is_null($combat->selectHealingTarget($character))) {
420
+    } elseif(in_array($character, $combat->findHealers()->toArray(), true) and !is_null($combat->selectHealingTarget($character))) {
421 421
       return CombatAction::ACTION_HEALING;
422 422
     }
423 423
     $attackTarget = $combat->selectAttackTarget($character);
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
       "character1" => $character1, "character2" => $target,
601 601
     ];
602 602
     $effect = new CharacterEffect([
603
-      "id" => "skill{$skill->skill->id}Effect",
603
+      "id" => "skill{$skill->skill->id}effect",
604 604
       "type" => $skill->skill->type,
605 605
       "stat" => ((in_array($skill->skill->type, SkillSpecial::NO_STAT_TYPES, true)) ? NULL : $skill->skill->stat),
606 606
       "value" => $skill->value,
Please login to merge, or discard this patch.
src/Character.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
   public function damageStat(): string {
521 521
     $stat = static::STAT_STRENGTH;
522 522
     foreach($this->equipment as $item) {
523
-      if(!$item->worn OR $item->slot != Equipment::SLOT_WEAPON) {
523
+      if(!$item->worn or $item->slot != Equipment::SLOT_WEAPON) {
524 524
         continue;
525 525
       }
526 526
       switch($item->type) {
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
       $stat = $effect->stat;
580 580
       $type = $effect->type;
581 581
       $duration = $effect->duration;
582
-      if(is_int($duration) AND $duration < 1) {
582
+      if(is_int($duration) and $duration < 1) {
583 583
         $this->removeEffect($effect->id);
584 584
         continue;
585 585
       }
Please login to merge, or discard this patch.