phan 처리

hwe/sammo/Command/BaseCommand.php

@@ -14,10 +14,6 @@ use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
 abstract class BaseCommand{
-    /**
-     * @var General|null $generalObj
-     * @var General|null $destGeneralObj
-     */
     static protected $actionName = 'CommandName';
     static public $reqArg = false;
 
@@ -253,7 +249,7 @@ abstract class BaseCommand{
         return static::$actionName;
     }
 
-    public function getLogger():ActionLogger{
+    public function getLogger():?ActionLogger{
         return $this->logger;
     }
 
@@ -403,7 +399,6 @@ abstract class BaseCommand{
     }
     public function getForm():string{
         throw new \sammo\MustNotBeReachedException();
-        return '';
     }
 
     public function getLastTurn():LastTurn{

hwe/sammo/Command/General/che_상업투자.php

@@ -29,6 +29,8 @@ class che_상업투자 extends Command\GeneralCommand{
     static protected $actionName = '상업 투자';
     static protected $debuffFront = 0.5;
 
+    protected $reqGold;
+
     protected function argTest():bool{
         $this->arg = null;
         return true;

hwe/sammo/Command/General/che_정착장려.php

@@ -28,6 +28,8 @@ class che_정착장려 extends Command\GeneralCommand{
     static protected $actionKey = '인구';
     static protected $actionName = '정착 장려';
 
+    protected $reqRice;
+
     protected function argTest():bool{
         $this->arg = null;
         return true;

hwe/sammo/Command/General/che_주민선정.php

@@ -28,6 +28,8 @@ class che_주민선정 extends Command\GeneralCommand{
     static protected $actionKey = '민심';
     static protected $actionName = '주민 선정';
 
+    protected $reqRice;
+
     protected function argTest():bool{
         $this->arg = null;
         return true;

hwe/sammo/Command/General/che_징병.php

@@ -24,9 +24,6 @@ use \sammo\Constraint\ConstraintHelper;
 
 
 class che_징병 extends Command\GeneralCommand{
-    /**
-     * @var \sammo\GameUnitDetail $reqCrewType
-     */
     static protected $actionName = '징병';
     static protected $costOffset = 1;
     static public $reqArg = true;

hwe/sammo/Command/Nation/che_물자원조.php

@@ -98,8 +98,8 @@ class che_물자원조 extends Command\NationCommand{
             ConstraintHelper::OccupiedCity(),
             ConstraintHelper::BeChief(),
             ConstraintHelper::SuppliedCity(),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold+($goldAmount>0)?1:0),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice+($riceAmount>0)?1:0),
+            ConstraintHelper::ReqNationGold(GameConst::$basegold+(($goldAmount>0)?1:0)),
+            ConstraintHelper::ReqNationRice(GameConst::$baserice+(($riceAmount>0)?1:0)),
             ConstraintHelper::ReqNationValue('surlimit', '외교제한', '==', 0, '외교제한중입니다.'),
             ConstraintHelper::ReqDestNationValue('surlimit', '외교제한', '==', 0, '상대국이 외교제한중입니다.'),
         ];