[2.3] CS And DocBlock Fixes

Author: GrahamCampbell

Options.php

@@ -22,24 +22,28 @@ class Options implements \ArrayAccess, \Iterator, \Countable
 {
     /**
      * A list of option values.
+     *
      * @var array
      */
     private $options = array();
 
     /**
      * A list of normalizer closures.
+     *
      * @var array
      */
     private $normalizers = array();
 
     /**
      * A list of closures for evaluating lazy options.
+     *
      * @var array
      */
     private $lazy = array();
 
     /**
      * A list containing the currently locked options.
+     *
      * @var array
      */
     private $lock = array();

OptionsResolver.php

@@ -25,30 +25,35 @@ class OptionsResolver implements OptionsResolverInterface
 {
     /**
      * The default option values.
+     *
      * @var Options
      */
     private $defaultOptions;
 
     /**
      * The options known by the resolver.
+     *
      * @var array
      */
     private $knownOptions = array();
 
     /**
      * The options without defaults that are required to be passed to resolve().
+     *
      * @var array
      */
     private $requiredOptions = array();
 
     /**
      * A list of accepted values for each option.
+     *
      * @var array
      */
     private $allowedValues = array();
 
     /**
      * A list of accepted types for each option.
+     *
      * @var array
      */
     private $allowedTypes = array();