| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent d9e9499 commit 548e7d6
16 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,65 +28,68 @@ | |||
| 28 | 28 | class BanEntry{ | |
| 29 | 29 | public static $format = "Y-m-d H:i:s O"; | |
| 30 | 30 | ||
| 31 | + /** @var string */ | ||
| 31 | 32 | private $name; | |
| 32 | 33 | /** @var \DateTime */ | |
| 33 | 34 | private $creationDate = null; | |
| 35 | + /** @var string */ | ||
| 34 | 36 | private $source = "(Unknown)"; | |
| 35 | 37 | /** @var \DateTime */ | |
| 36 | 38 | private $expirationDate = null; | |
| 39 | + /** @var string */ | ||
| 37 | 40 | private $reason = "Banned by an operator."; | |
| 38 | 41 | ||
| 39 | - public function __construct($name){ | ||
| 42 | + public function __construct(string $name){ | ||
| 40 | 43 | $this->name = strtolower($name); | |
| 41 | 44 | $this->creationDate = new \DateTime(); | |
| 42 | 45 | } | |
| 43 | 46 | ||
| 44 | - public function getName(){ | ||
| 47 | + public function getName() : string{ | ||
| 45 | 48 | return $this->name; | |
| 46 | 49 | } | |
| 47 | 50 | ||
| 48 | - public function getCreated(){ | ||
| 51 | + public function getCreated() : \DateTime{ | ||
| 49 | 52 | return $this->creationDate; | |
| 50 | 53 | } | |
| 51 | 54 | ||
| 52 | 55 | public function setCreated(\DateTime $date){ | |
| 53 | 56 | $this->creationDate = $date; | |
| 54 | 57 | } | |
| 55 | 58 | ||
| 56 | - public function getSource(){ | ||
| 59 | + public function getSource() : string{ | ||
| 57 | 60 | return $this->source; | |
| 58 | 61 | } | |
| 59 | 62 | ||
| 60 | - public function setSource($source){ | ||
| 63 | + public function setSource(string $source){ | ||
| 61 | 64 | $this->source = $source; | |
| 62 | 65 | } | |
| 63 | 66 | ||
| 64 | - public function getExpires(){ | ||
| 67 | + public function getExpires() : \DateTime{ | ||
| 65 | 68 | return $this->expirationDate; | |
| 66 | 69 | } | |
| 67 | 70 | ||
| 68 | 71 | /** | |
| 69 | 72 | * @param \DateTime $date | |
| 70 | 73 | */ | |
| 71 | - public function setExpires($date){ | ||
| 74 | + public function setExpires(\DateTime $date){ | ||
| 72 | 75 | $this->expirationDate = $date; | |
| 73 | 76 | } | |
| 74 | 77 | ||
| 75 | - public function hasExpired(){ | ||
| 78 | + public function hasExpired() : bool{ | ||
| 76 | 79 | $now = new \DateTime(); | |
| 77 | 80 | ||
| 78 | 81 | return $this->expirationDate === null ? false : $this->expirationDate < $now; | |
| 79 | 82 | } | |
| 80 | 83 | ||
| 81 | - public function getReason(){ | ||
| 84 | + public function getReason() : string{ | ||
| 82 | 85 | return $this->reason; | |
| 83 | 86 | } | |
| 84 | 87 | ||
| 85 | - public function setReason($reason){ | ||
| 88 | + public function setReason(string $reason){ | ||
| 86 | 89 | $this->reason = $reason; | |
| 87 | 90 | } | |
| 88 | 91 | ||
| 89 | - public function getString(){ | ||
| 92 | + public function getString() : string{ | ||
| 90 | 93 | $str = ""; | |
| 91 | 94 | $str .= $this->getName(); | |
| 92 | 95 | $str .= "|"; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,28 +40,28 @@ class BanList{ | |||
| 40 | 40 | /** | |
| 41 | 41 | * @param string $file | |
| 42 | 42 | */ | |
| 43 | - public function __construct($file){ | ||
| 43 | + public function __construct(string $file){ | ||
| 44 | 44 | $this->file = $file; | |
| 45 | 45 | } | |
| 46 | 46 | ||
| 47 | 47 | /** | |
| 48 | 48 | * @return bool | |
| 49 | 49 | */ | |
| 50 | - public function isEnabled(){ | ||
| 50 | + public function isEnabled() : bool{ | ||
| 51 | 51 | return $this->enabled === true; | |
| 52 | 52 | } | |
| 53 | 53 | ||
| 54 | 54 | /** | |
| 55 | 55 | * @param bool $flag | |
| 56 | 56 | */ | |
| 57 | - public function setEnabled($flag){ | ||
| 58 | - $this->enabled = (bool) $flag; | ||
| 57 | + public function setEnabled(bool $flag){ | ||
| 58 | + $this->enabled = $flag; | ||
| 59 | 59 | } | |
| 60 | 60 | ||
| 61 | 61 | /** | |
| 62 | 62 | * @return BanEntry[] | |
| 63 | 63 | */ | |
| 64 | - public function getEntries(){ | ||
| 64 | + public function getEntries() : array{ | ||
| 65 | 65 | $this->removeExpired(); | |
| 66 | 66 | ||
| 67 | 67 | return $this->list; | |
@@ -72,7 +72,7 @@ public function getEntries(){ | |||
| 72 | 72 | * | |
| 73 | 73 | * @return bool | |
| 74 | 74 | */ | |
| 75 | - public function isBanned($name){ | ||
| 75 | + public function isBanned(string $name) : bool{ | ||
| 76 | 76 | $name = strtolower($name); | |
| 77 | 77 | if(!$this->isEnabled()){ | |
| 78 | 78 | return false; | |
@@ -99,7 +99,7 @@ public function add(BanEntry $entry){ | |||
| 99 | 99 | * | |
| 100 | 100 | * @return BanEntry | |
| 101 | 101 | */ | |
| 102 | - public function addBan($target, $reason = null, $expires = null, $source = null){ | ||
| 102 | + public function addBan(string $target, string $reason = null, \DateTime $expires = null, string $source = null) : BanEntry{ | ||
| 103 | 103 | $entry = new BanEntry($target); | |
| 104 | 104 | $entry->setSource($source != null ? $source : $entry->getSource()); | |
| 105 | 105 | $entry->setExpires($expires); | |
@@ -114,7 +114,7 @@ public function addBan($target, $reason = null, $expires = null, $source = null) | |||
| 114 | 114 | /** | |
| 115 | 115 | * @param string $name | |
| 116 | 116 | */ | |
| 117 | - public function remove($name){ | ||
| 117 | + public function remove(string $name){ | ||
| 118 | 118 | $name = strtolower($name); | |
| 119 | 119 | if(isset($this->list[$name])){ | |
| 120 | 120 | unset($this->list[$name]); | |
@@ -148,7 +148,10 @@ public function load(){ | |||
| 148 | 148 | } | |
| 149 | 149 | } | |
| 150 | 150 | ||
| 151 | - public function save($flag = true){ | ||
| 151 | + /** | ||
| 152 | + * @param bool $flag | ||
| 153 | + */ | ||
| 154 | + public function save(bool $flag = true){ | ||
| 152 | 155 | $this->removeExpired(); | |
| 153 | 156 | $fp = @fopen($this->file, "w"); | |
| 154 | 157 | if(is_resource($fp)){ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,7 +34,7 @@ abstract class DefaultPermissions{ | |||
| 34 | 34 | * | |
| 35 | 35 | * @return Permission | |
| 36 | 36 | */ | |
| 37 | - public static function registerPermission(Permission $perm, Permission $parent = null){ | ||
| 37 | + public static function registerPermission(Permission $perm, Permission $parent = null) : Permission{ | ||
| 38 | 38 | if($parent instanceof Permission){ | |
| 39 | 39 | $parent->getChildren()[$perm->getName()] = true; | |
| 40 | 40 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,16 +34,16 @@ interface Permissible extends ServerOperator{ | |||
| 34 | 34 | * | |
| 35 | 35 | * @return bool | |
| 36 | 36 | */ | |
| 37 | - public function isPermissionSet($name); | ||
| 37 | + public function isPermissionSet($name) : bool; | ||
| 38 | 38 | ||
| 39 | 39 | /** | |
| 40 | 40 | * Returns the permission value if overridden, or the default value if not | |
| 41 | 41 | * | |
| 42 | 42 | * @param string|Permission $name | |
| 43 | 43 | * | |
| 44 | - * @return mixed | ||
| 44 | + * @return bool | ||
| 45 | 45 | */ | |
| 46 | - public function hasPermission($name); | ||
| 46 | + public function hasPermission($name) : bool; | ||
| 47 | 47 | ||
| 48 | 48 | /** | |
| 49 | 49 | * @param Plugin $plugin | |
@@ -52,7 +52,7 @@ public function hasPermission($name); | |||
| 52 | 52 | * | |
| 53 | 53 | * @return PermissionAttachment | |
| 54 | 54 | */ | |
| 55 | - public function addAttachment(Plugin $plugin, $name = null, $value = null); | ||
| 55 | + public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment; | ||
| 56 | 56 | ||
| 57 | 57 | /** | |
| 58 | 58 | * @param PermissionAttachment $attachment | |
@@ -68,8 +68,8 @@ public function removeAttachment(PermissionAttachment $attachment); | |||
| 68 | 68 | public function recalculatePermissions(); | |
| 69 | 69 | ||
| 70 | 70 | /** | |
| 71 | - * @return Permission[] | ||
| 71 | + * @return PermissionAttachmentInfo[] | ||
| 72 | 72 | */ | |
| 73 | - public function getEffectivePermissions(); | ||
| 73 | + public function getEffectivePermissions() : array; | ||
| 74 | 74 | ||
| 75 | 75 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -63,7 +63,7 @@ public function __destruct(){ | |||
| 63 | 63 | /** | |
| 64 | 64 | * @return bool | |
| 65 | 65 | */ | |
| 66 | - public function isOp(){ | ||
| 66 | + public function isOp() : bool{ | ||
| 67 | 67 | if($this->opable === null){ | |
| 68 | 68 | return false; | |
| 69 | 69 | }else{ | |
@@ -76,7 +76,7 @@ public function isOp(){ | |||
| 76 | 76 | * | |
| 77 | 77 | * @throws \Exception | |
| 78 | 78 | */ | |
| 79 | - public function setOp($value){ | ||
| 79 | + public function setOp(bool $value){ | ||
| 80 | 80 | if($this->opable === null){ | |
| 81 | 81 | throw new \LogicException("Cannot change op value as no ServerOperator is set"); | |
| 82 | 82 | }else{ | |
@@ -89,7 +89,7 @@ public function setOp($value){ | |||
| 89 | 89 | * | |
| 90 | 90 | * @return bool | |
| 91 | 91 | */ | |
| 92 | - public function isPermissionSet($name){ | ||
| 92 | + public function isPermissionSet($name) : bool{ | ||
| 93 | 93 | return isset($this->permissions[$name instanceof Permission ? $name->getName() : $name]); | |
| 94 | 94 | } | |
| 95 | 95 | ||
@@ -98,7 +98,7 @@ public function isPermissionSet($name){ | |||
| 98 | 98 | * | |
| 99 | 99 | * @return bool | |
| 100 | 100 | */ | |
| 101 | - public function hasPermission($name){ | ||
| 101 | + public function hasPermission($name) : bool{ | ||
| 102 | 102 | if($name instanceof Permission){ | |
| 103 | 103 | $name = $name->getName(); | |
| 104 | 104 | } | |
@@ -122,13 +122,11 @@ public function hasPermission($name){ | |||
| 122 | 122 | * | |
| 123 | 123 | * @param Plugin $plugin | |
| 124 | 124 | * @param string $name | |
| 125 | - * @param bool $value | ||
| 125 | + * @param bool $value | ||
| 126 | 126 | * | |
| 127 | 127 | * @return PermissionAttachment | |
| 128 | - * | ||
| 129 | - * @throws PluginException | ||
| 130 | 128 | */ | |
| 131 | - public function addAttachment(Plugin $plugin, $name = null, $value = null){ | ||
| 129 | + public function addAttachment(Plugin $plugin, string $name = null, bool $value = null) : PermissionAttachment{ | ||
| 132 | 130 | if(!$plugin->isEnabled()){ | |
| 133 | 131 | throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled"); | |
| 134 | 132 | } | |
@@ -214,7 +212,7 @@ private function calculateChildPermissions(array $children, $invert, $attachment | |||
| 214 | 212 | /** | |
| 215 | 213 | * @return PermissionAttachmentInfo[] | |
| 216 | 214 | */ | |
| 217 | - public function getEffectivePermissions(){ | ||
| 215 | + public function getEffectivePermissions() : array{ | ||
| 218 | 216 | return $this->permissions; | |
| 219 | 217 | } | |
| 220 | 218 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,11 +40,11 @@ class Permission{ | |||
| 40 | 40 | public static $DEFAULT_PERMISSION = self::DEFAULT_OP; | |
| 41 | 41 | ||
| 42 | 42 | /** | |
| 43 | - * @param $value | ||
| 43 | + * @param bool|string $value | ||
| 44 | 44 | * | |
| 45 | 45 | * @return string | |
| 46 | 46 | */ | |
| 47 | - public static function getByName($value){ | ||
| 47 | + public static function getByName($value) : string{ | ||
| 48 | 48 | if(is_bool($value)){ | |
| 49 | 49 | if($value === true){ | |
| 50 | 50 | return "true"; | |
@@ -86,7 +86,7 @@ public static function getByName($value){ | |||
| 86 | 86 | /** | |
| 87 | 87 | * @var string[] | |
| 88 | 88 | */ | |
| 89 | - private $children = []; | ||
| 89 | + private $children; | ||
| 90 | 90 | ||
| 91 | 91 | /** @var string */ | |
| 92 | 92 | private $defaultValue; | |
@@ -99,7 +99,7 @@ public static function getByName($value){ | |||
| 99 | 99 | * @param string $defaultValue | |
| 100 | 100 | * @param Permission[] $children | |
| 101 | 101 | */ | |
| 102 | - public function __construct($name, $description = null, $defaultValue = null, array $children = []){ | ||
| 102 | + public function __construct(string $name, string $description = null, string $defaultValue = null, array $children = []){ | ||
| 103 | 103 | $this->name = $name; | |
| 104 | 104 | $this->description = $description ?? ""; | |
| 105 | 105 | $this->defaultValue = $defaultValue ?? self::$DEFAULT_PERMISSION; | |
@@ -111,28 +111,28 @@ public function __construct($name, $description = null, $defaultValue = null, ar | |||
| 111 | 111 | /** | |
| 112 | 112 | * @return string | |
| 113 | 113 | */ | |
| 114 | - public function getName(){ | ||
| 114 | + public function getName() : string{ | ||
| 115 | 115 | return $this->name; | |
| 116 | 116 | } | |
| 117 | 117 | ||
| 118 | 118 | /** | |
| 119 | 119 | * @return string[] | |
| 120 | 120 | */ | |
| 121 | - public function &getChildren(){ | ||
| 121 | + public function &getChildren() : array{ | ||
| 122 | 122 | return $this->children; | |
| 123 | 123 | } | |
| 124 | 124 | ||
| 125 | 125 | /** | |
| 126 | 126 | * @return string | |
| 127 | 127 | */ | |
| 128 | - public function getDefault(){ | ||
| 128 | + public function getDefault() : string{ | ||
| 129 | 129 | return $this->defaultValue; | |
| 130 | 130 | } | |
| 131 | 131 | ||
| 132 | 132 | /** | |
| 133 | 133 | * @param string $value | |
| 134 | 134 | */ | |
| 135 | - public function setDefault($value){ | ||
| 135 | + public function setDefault(string $value){ | ||
| 136 | 136 | if($value !== $this->defaultValue){ | |
| 137 | 137 | $this->defaultValue = $value; | |
| 138 | 138 | $this->recalculatePermissibles(); | |
@@ -142,21 +142,21 @@ public function setDefault($value){ | |||
| 142 | 142 | /** | |
| 143 | 143 | * @return string | |
| 144 | 144 | */ | |
| 145 | - public function getDescription(){ | ||
| 145 | + public function getDescription() : string{ | ||
| 146 | 146 | return $this->description; | |
| 147 | 147 | } | |
| 148 | 148 | ||
| 149 | 149 | /** | |
| 150 | 150 | * @param string $value | |
| 151 | 151 | */ | |
| 152 | - public function setDescription($value){ | ||
| 152 | + public function setDescription(string $value){ | ||
| 153 | 153 | $this->description = $value; | |
| 154 | 154 | } | |
| 155 | 155 | ||
| 156 | 156 | /** | |
| 157 | 157 | * @return Permissible[] | |
| 158 | 158 | */ | |
| 159 | - public function getPermissibles(){ | ||
| 159 | + public function getPermissibles() : array{ | ||
| 160 | 160 | return Server::getInstance()->getPluginManager()->getPermissionSubscriptions($this->name); | |
| 161 | 161 | } | |
| 162 | 162 | ||
@@ -196,12 +196,12 @@ public function addParent($name, $value){ | |||
| 196 | 196 | } | |
| 197 | 197 | ||
| 198 | 198 | /** | |
| 199 | - * @param array $data | ||
| 200 | - * @param $default | ||
| 199 | + * @param array $data | ||
| 200 | + * @param string $default | ||
| 201 | 201 | * | |
| 202 | 202 | * @return Permission[] | |
| 203 | 203 | */ | |
| 204 | - public static function loadPermissions(array $data, $default = self::DEFAULT_OP){ | ||
| 204 | + public static function loadPermissions(array $data, string $default = self::DEFAULT_OP) : array{ | ||
| 205 | 205 | $result = []; | |
| 206 | 206 | foreach($data as $key => $entry){ | |
| 207 | 207 | $result[] = self::loadPermission($key, $entry, $default, $result); | |
@@ -220,7 +220,7 @@ public static function loadPermissions(array $data, $default = self::DEFAULT_OP) | |||
| 220 | 220 | * | |
| 221 | 221 | * @throws \Exception | |
| 222 | 222 | */ | |
| 223 | - public static function loadPermission($name, array $data, $default = self::DEFAULT_OP, &$output = []){ | ||
| 223 | + public static function loadPermission(string $name, array $data, string $default = self::DEFAULT_OP, array &$output = []) : Permission{ | ||
| 224 | 224 | $desc = null; | |
| 225 | 225 | $children = []; | |
| 226 | 226 | if(isset($data["default"])){ | |
| Back | FazBrowse Home | New Git URL |
0 commit comments