- fixed some PHP type declarations, closed #783

- fixed missing "connection types" for type `stargate` and `abyssal` to whitelist
exodus4d · Jun 2, 2019 · 017d8d9 · 017d8d9
1 parent cffeea8
commit 017d8d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/main/model/pathfinder/connectionmodel.php b/app/main/model/pathfinder/connectionmodel.php
@@ -92,7 +92,7 @@ class ConnectionModel extends AbstractMapTrackingModel {
      * allowed connection types
      * @var array
      */
-    protected static $connectionTypeWhitelist = ['wh_fresh', 'wh_reduced', 'wh_critical', 'frigate', 'preserve_mass'];
+    protected static $connectionTypeWhitelist = ['stargate', 'abyssal', 'wh_fresh', 'wh_reduced', 'wh_critical', 'frigate', 'preserve_mass'];
 
     /**
      * get connection data
@@ -315,7 +315,7 @@ public function afterEraseEvent($self, $pkeys){
      * @return logging\LogInterface
      * @throws \Exception\ConfigException
      */
-    public function newLog($action = '') : Logging\LogInterface {
+    public function newLog(string $action = '') : Logging\LogInterface {
         return $this->getMap()->newLog($action)->setTempData($this->getLogObjectData());
     }
 

diff --git a/app/main/model/pathfinder/mapmodel.php b/app/main/model/pathfinder/mapmodel.php
@@ -977,7 +977,7 @@ public function getAllCorporations() : array {
      * @return logging\LogInterface
      * @throws ConfigException
      */
-    public function newLog($action = '') : Logging\LogInterface{
+    public function newLog(string $action = '') : Logging\LogInterface{
         $logChannelData = $this->getLogChannelData();
         $logObjectData = $this->getLogObjectData();
         $log = (new logging\MapLog($action, $logChannelData))->setTempData($logObjectData);

diff --git a/app/main/model/pathfinder/systemmodel.php b/app/main/model/pathfinder/systemmodel.php
@@ -538,7 +538,7 @@ public function getNewSignature() : SystemSignatureModel {
      * @return logging\LogInterface
      * @throws \Exception\ConfigException
      */
-    public function newLog($action = '') : Logging\LogInterface{
+    public function newLog(string $action = '') : Logging\LogInterface{
         return $this->getMap()->newLog($action)->setTempData($this->getLogObjectData());
     }
 

diff --git a/app/main/model/pathfinder/systemsignaturemodel.php b/app/main/model/pathfinder/systemsignaturemodel.php
@@ -173,7 +173,7 @@ protected function validate_name(string $key, string $val): bool {
      * @return logging\LogInterface
      * @throws \Exception\ConfigException
      */
-    public function newLog($action = ''): Logging\LogInterface{
+    public function newLog(string $action = ''): Logging\LogInterface{
         return $this->getMap()->newLog($action)->setTempData($this->getLogObjectData());
     }