Env typehint & style cleanup

mattwellss · Dec 29, 2017 · 0cdbdb2 · 0cdbdb2
1 parent d83932b
commit 0cdbdb2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/Sphpeme/Env/AggregateEnv.php b/Sphpeme/Env/AggregateEnv.php
@@ -2,8 +2,6 @@
 
 namespace Sphpeme\Env;
 
-
-
 class AggregateEnv implements EnvInterface
 {
     protected $extensions = [];
@@ -15,7 +13,7 @@ public function __construct(EnvInterface ...$envs)
         }
     }
 
-    public function __isset($prop): bool
+    public function __isset(string $prop): bool
     {
         foreach ($this->extensions as $extension) {
             if (isset($extension->$prop)) {
@@ -42,4 +40,4 @@ public function __get(string $prop)
 
         return false;
     }
-}
+}
diff --git a/Sphpeme/Env/BoolEnv.php b/Sphpeme/Env/BoolEnv.php
@@ -61,9 +61,10 @@ public function not($arg): bool
 
     /**
      * @param $arg
-     * @return bool
+     * @return boo
      */
-    public function isBool($arg)
+    public
+        function isBool($arg)
     {
         return \is_bool($arg);
     }

diff --git a/Sphpeme/Env/EnvInterface.php b/Sphpeme/Env/EnvInterface.php
@@ -5,6 +5,6 @@
 
 interface EnvInterface
 {
-    public function __get(string $pop);
-    public function __isset($prop): bool;
-}
+    public function __get(string $prop);
+    public function __isset(string $prop): bool;
+}
diff --git a/Sphpeme/Env/MappedEnvTrait.php b/Sphpeme/Env/MappedEnvTrait.php
@@ -2,14 +2,21 @@
 
 namespace Sphpeme\Env;
 
-
 trait MappedEnvTrait
 {
-    public function __isset($prop): bool
+    /**
+     * @param string $prop
+     * @return bool
+     */
+    public function __isset(string $prop): bool
     {
         return (bool)$this->__get($prop);
     }
 
+    /**
+     * @param string $prop
+     * @return mixed
+     */
     public function __get(string $prop)
     {
         if (isset(static::MAPPING[$prop])) {
@@ -20,4 +27,4 @@ public function __get(string $prop)
             ? [$this, $prop]
             : $this->$prop;
     }
-}
+}
diff --git a/Sphpeme/Env/SimpleEnv.php b/Sphpeme/Env/SimpleEnv.php
@@ -2,7 +2,6 @@
 
 namespace Sphpeme\Env;
 
-
 class SimpleEnv implements EnvInterface
 {
     /**
@@ -20,8 +19,8 @@ public function __get(string $prop)
         return $this->members[$prop];
     }
 
-    public function __isset($prop): bool
+    public function __isset(string $prop): bool
     {
         return isset($this->members[$prop]);
     }
-}
+}