Php Inspections (EA Extended) - static code analysis includes:

Reduce couple count calls in [Yaml]
Modernize type casting, fix several strict comparisons
Unsets merged
Elvis operator usage
Short syntax for applied operations

Author: kalessil

Options.php

@@ -92,8 +92,7 @@ public function set($option, $value)
 
         // Setting is equivalent to overloading while discarding the previous
         // option value
-        unset($this->options[$option]);
-        unset($this->lazy[$option]);
+        unset($this->options[$option], $this->lazy[$option]);
 
         $this->overload($option, $value);
     }
@@ -270,9 +269,7 @@ public function remove($option)
             throw new OptionDefinitionException('Options cannot be removed anymore once options have been read.');
         }
 
-        unset($this->options[$option]);
-        unset($this->lazy[$option]);
-        unset($this->normalizers[$option]);
+        unset($this->options[$option], $this->lazy[$option], $this->normalizers[$option]);
     }
 
     /**
@@ -470,10 +467,8 @@ private function resolve($option)
         foreach ($this->lazy[$option] as $closure) {
             $this->options[$option] = $closure($this, $this->options[$option]);
         }
-        unset($this->lock[$option]);
-
         // The option now isn't lazy anymore
-        unset($this->lazy[$option]);
+        unset($this->lock[$option], $this->lazy[$option]);
     }
 
     /**
@@ -509,9 +504,7 @@ private function normalize($option)
 
         $this->lock[$option] = true;
         $this->options[$option] = $normalizer($this, array_key_exists($option, $this->options) ? $this->options[$option] : null);
-        unset($this->lock[$option]);
-
         // The option is now normalized
-        unset($this->normalizers[$option]);
+        unset($this->lock[$option], $this->normalizers[$option]);
     }
 }