diff --git a/Core/Core_c.php b/Core/Core_c.php
index b75236ab..ed6462e1 100644
--- a/Core/Core_c.php
+++ b/Core/Core_c.php
@@ -569,7 +569,6 @@ final class Closure {
     /**
      * This method is a static version of Closure::bindTo().
      * See the documentation of that method for more information.
-     * @static
      * @link https://secure.php.net/manual/en/closure.bind.php
      * @param Closure $closure The anonymous functions to bind.
      * @param object $newthis The object to which the given anonymous function should be bound, or NULL for the closure to be unbound.
diff --git a/SimpleXML/SimpleXML.php b/SimpleXML/SimpleXML.php
index 5e3317b5..aaa080b1 100644
--- a/SimpleXML/SimpleXML.php
+++ b/SimpleXML/SimpleXML.php
@@ -23,7 +23,7 @@ class SimpleXMLElement implements Traversable, ArrayAccess, Countable {
 
 	/**
      * Provides access to element's children
-     * @access private Method not callable directly, stub exists for typehint only
+     * private Method not callable directly, stub exists for typehint only
      * @param string $name child name
      * @return SimpleXMLElement
      */
@@ -214,7 +214,7 @@ class SimpleXMLElement implements Traversable, ArrayAccess, Countable {
 
     /**
      * Class provides access to children by position, and attributes by name
-     * @access private Method not callable directly, stub exists for typehint only
+     * private Method not callable directly, stub exists for typehint only
      * @param string|int $offset
      * @return bool true on success or false on failure.
      */
@@ -222,7 +222,7 @@ class SimpleXMLElement implements Traversable, ArrayAccess, Countable {
 
     /**
      * Class provides access to children by position, and attributes by name
-     * @access private Method not callable directly, stub exists for typehint only
+     * private Method not callable directly, stub exists for typehint only
      * @param string|int $offset
      * @return SimpleXMLElement Either a named attribute or an element from a list of children
      */
@@ -230,7 +230,7 @@ class SimpleXMLElement implements Traversable, ArrayAccess, Countable {
 
     /**
      * Class provides access to children by position, and attributes by name
-     * @access private Method not callable directly, stub exists for typehint only
+     * private Method not callable directly, stub exists for typehint only
      * @param string|int $offset
      * @param mixed $value
      * @return void
@@ -239,7 +239,7 @@ class SimpleXMLElement implements Traversable, ArrayAccess, Countable {
 
     /**
      * Class provides access to children by position, and attributes by name
-     * @access private Method not callable directly, stub exists for typehint only
+     * private Method not callable directly, stub exists for typehint only
      * @param string|int $offset
      * @return void
      */
diff --git a/cassandra/cassandra.php b/cassandra/cassandra.php
index 5d2ebde1..9b57e3a6 100644
--- a/cassandra/cassandra.php
+++ b/cassandra/cassandra.php
@@ -4189,7 +4189,7 @@ namespace Cassandra {
 
         /**
          * Initialize a Collection type
-         * @code{.php}
+         * ```php
          * <?php
          * use Type;
          *
@@ -4197,7 +4197,7 @@ namespace Cassandra {
          *                   ->create(1, 2, 3, 4, 5, 6, 7, 8, 9);
          *
          * var_dump($collection);
-         * @endcode
+         * ```
          *
          * @param \Cassandra\Type $type The type of values
          *
@@ -4210,7 +4210,7 @@ namespace Cassandra {
 
         /**
          * Initialize a set type
-         * @code{.php}
+         * ```
          * <?php
          * use Type;
          *
@@ -4218,7 +4218,7 @@ namespace Cassandra {
          *            ->create("a", "b", "c", "d", "e", "f", "g", "h", "i", "j");
          *
          * var_dump($set);
-         * @endcode
+         * ```
          *
          * @param \Cassandra\Type $type The types of values
          *
@@ -4231,15 +4231,13 @@ namespace Cassandra {
 
         /**
          * Initialize a map type
-         * @code{.php}
-         * <?php
+         * ```<?php
          * use Type;
          *
          * $map = Type::map(Type::int(), Type::varchar())
          *            ->create(1, "a", 2, "b", 3, "c", 4, "d", 5, "e", 6, "f")
          *
-         * var_dump($map);
-         * @endcode
+         * var_dump($map);```
          *
          * @param \Cassandra\Type $keyType The type of keys
          * @param \Cassandra\Type $valueType The type of values
@@ -4253,15 +4251,13 @@ namespace Cassandra {
 
         /**
          * Initialize a tuple type
-         * @code{.php}
-         * <?php
+         * ```<?php
          * use Type;
          *
          * $tuple = Type::tuple(Type::varchar(), Type::int())
          *            ->create("a", 123);
          *
-         * var_dump($tuple);
-         * @endcode
+         * var_dump($tuple);```
          *
          * @param \Cassandra\Type $types A variadic list of types
          *
@@ -4274,15 +4270,13 @@ namespace Cassandra {
 
         /**
          * Initialize a user type
-         * @code{.php}
-         * <?php
+         * ```<?php
          * use Type;
          *
          * $userType = Type::userType("a", Type::varchar(), "b", Type::int())
          *                 ->create("a", "abc", "b", 123);
          *
-         * var_dump($userType);
-         * @endcode
+         * var_dump($userType);```
          *
          * @param \Cassandra\Type $types A variadic list of name/type pairs
          *
@@ -7043,8 +7037,7 @@ namespace Cassandra\Type {
         /**
          * Creates a new Map from the given values.
          *
-         * @code{.php}
-         * <?php
+         * ```<?php
          * use Type;
          * use Uuid;
          *
@@ -7053,8 +7046,7 @@ namespace Cassandra\Type {
          *                      new Uuid(), 'second uuid',
          *                      new Uuid(), 'third uuid');
          *
-         * var_dump($map);
-         * @endcode
+         * var_dump($map);```
          *
          *
          *                          is a key and each even value is a value for the
diff --git a/couchbase/couchbase.php b/couchbase/couchbase.php
index 7887db1e..8d591fda 100644
--- a/couchbase/couchbase.php
+++ b/couchbase/couchbase.php
@@ -2004,7 +2004,7 @@ namespace Couchbase {
          * Controls the profiling mode used during query execution
          *
          * @param string $profileType
-         * @returns N1qlQuery
+         * @return N1qlQuery
          * @see \Couchbase\N1qlQuery::PROFILE_NONE
          * @see \Couchbase\N1qlQuery::PROFILE_PHASES
          * @see \Couchbase\N1qlQuery::PROFILE_TIMINGS
diff --git a/fann/fann.php b/fann/fann.php
index 1cb0d063..71ed5152 100644
--- a/fann/fann.php
+++ b/fann/fann.php
@@ -64,7 +64,6 @@ class FANNConnection
 /**
  * Trains on an entire dataset, for a period of time using the Cascade2 training algorithm
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $data
@@ -81,7 +80,6 @@ function fann_cascadetrain_on_data($ann, $data, $max_neurons, $neurons_between_r
 /**
  * Trains on an entire dataset read from file, for a period of time using the Cascade2 training algorithm.
  *
- * @stub
  *
  * @param resource $ann
  * @param string $filename
@@ -98,7 +96,6 @@ function fann_cascadetrain_on_file($ann, $filename, $max_neurons, $neurons_betwe
 /**
  * Clears scaling parameters
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -111,7 +108,6 @@ function fann_clear_scaling_params($ann)
 /**
  * Creates a copy of a fann structure
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -124,7 +120,6 @@ function fann_copy($ann)
 /**
  * Constructs a backpropagation neural network from a configuration file
  *
- * @stub
  *
  * @param string $configuration_file
  *
@@ -137,7 +132,6 @@ function fann_create_from_file($configuration_file)
 /**
  * Creates a standard backpropagation neural network which is not fully connectected and has shortcut connections
  *
- * @stub
  *
  * @param int $num_layers
  * @param array $layers
@@ -152,7 +146,6 @@ function fann_create_shortcut_array($num_layers, $layers)
  * Creates a standard backpropagation neural network which is not fully connectected and has shortcut connections
  *
  * @stub-variable-parameters
- * @stub
  *
  * @param int $num_layers
  * @param int $num_neurons1
@@ -168,7 +161,6 @@ function fann_create_shortcut($num_layers, $num_neurons1, $num_neurons2, $_ = NU
 /**
  * Creates a standard backpropagation neural network, which is not fully connected using an array of layer sizes
  *
- * @stub
  *
  * @param float $connection_rate
  * @param int $num_layers
@@ -184,7 +176,6 @@ function fann_create_sparse_array($connection_rate, $num_layers, $layers)
  * Creates a standard backpropagation neural network, which is not fully connected
  *
  * @stub-variable-parameters
- * @stub
  *
  * @param float $connection_rate
  * @param int $num_layers
@@ -201,7 +192,6 @@ function fann_create_sparse($connection_rate, $num_layers, $num_neurons1, $num_n
 /**
  * Creates a standard fully connected backpropagation neural network using an array of layer sizes
  *
- * @stub
  *
  * @param int $num_layers
  * @param array $layers
@@ -215,8 +205,6 @@ function fann_create_standard_array($num_layers, $layers)
 /**
  * Creates a standard fully connected backpropagation neural network
  *
- * @stub-variable-parameters
- * @stub
  *
  * @param int $num_layers
  * @param int $num_neurons1
@@ -232,7 +220,6 @@ function fann_create_standard($num_layers, $num_neurons1, $num_neurons2, $_ = NU
 /**
  * Creates the training data struct from a user supplied function
  *
- * @stub
  *
  * @param int $num_data
  * @param int $num_input
@@ -248,7 +235,6 @@ function fann_create_train_from_callback($num_data, $num_input, $num_output, $us
 /**
  * Creates an empty training data struct
  *
- * @stub
  *
  * @param int $num_data
  * @param int $num_input
@@ -263,7 +249,6 @@ function fann_create_train($num_data, $num_input, $num_output)
 /**
  * Scale data in input vector after get it from ann based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param array $input_vector
@@ -277,7 +262,6 @@ function fann_descale_input($ann, $input_vector)
 /**
  * Scale data in output vector after get it from ann based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param array $output_vector
@@ -291,7 +275,6 @@ function fann_descale_output($ann, $output_vector)
 /**
  * Descale input and output data based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -305,7 +288,6 @@ function fann_descale_train($ann, $train_data)
 /**
  * Destroys the entire network and properly freeing all the associated memory
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -318,7 +300,6 @@ function fann_destroy($ann)
 /**
  * Destructs the training data
  *
- * @stub
  *
  * @param resource $train_data
  *
@@ -331,7 +312,6 @@ function fann_destroy_train($train_data)
 /**
  * Returns an exact copy of a fann train data
  *
- * @stub
  *
  * @param resource $data
  *
@@ -344,7 +324,6 @@ function fann_duplicate_train_data($data)
 /**
  * Returns the activation function
  *
- * @stub
  *
  * @param resource $ann
  * @param int $layer
@@ -359,7 +338,6 @@ function fann_get_activation_function($ann, $layer, $neuron)
 /**
  * Returns the activation steepness for supplied neuron and layer number
  *
- * @stub
  *
  * @param resource $ann
  * @param int $layer
@@ -374,7 +352,6 @@ function fann_get_activation_steepness($ann, $layer, $neuron)
 /**
  * Get the number of bias in each layer in the network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -387,7 +364,6 @@ function fann_get_bias_array($ann)
 /**
  * Returns the bit fail limit used during training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -400,7 +376,6 @@ function fann_get_bit_fail_limit($ann)
 /**
  * The number of fail bits
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -413,7 +388,6 @@ function fann_get_bit_fail($ann)
 /**
  * Returns the number of cascade activation functions
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -426,7 +400,6 @@ function fann_get_cascade_activation_functions_count($ann)
 /**
  * Returns the cascade activation functions
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -439,7 +412,6 @@ function fann_get_cascade_activation_functions($ann)
 /**
  * The number of activation steepnesses
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -452,7 +424,6 @@ function fann_get_cascade_activation_steepnesses_count($ann)
 /**
  * Returns the cascade activation steepnesses
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -465,7 +436,6 @@ function fann_get_cascade_activation_steepnesses($ann)
 /**
  * Returns the cascade candidate change fraction
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -478,7 +448,6 @@ function fann_get_cascade_candidate_change_fraction($ann)
 /**
  * Return the candidate limit
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -491,7 +460,6 @@ function fann_get_cascade_candidate_limit($ann)
 /**
  * Returns the number of cascade candidate stagnation epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -504,7 +472,6 @@ function fann_get_cascade_candidate_stagnation_epochs($ann)
 /**
  * Returns the maximum candidate epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -517,7 +484,6 @@ function fann_get_cascade_max_cand_epochs($ann)
 /**
  * Returns the maximum out epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -530,7 +496,6 @@ function fann_get_cascade_max_out_epochs($ann)
 /**
  * Returns the minimum candidate epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -543,7 +508,6 @@ function fann_get_cascade_min_cand_epochs($ann)
 /**
  * Returns the minimum out epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -556,7 +520,6 @@ function fann_get_cascade_min_out_epochs($ann)
 /**
  * Returns the number of candidate groups
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -569,7 +532,6 @@ function fann_get_cascade_num_candidate_groups($ann)
 /**
  * Returns the number of candidates used during training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -582,7 +544,6 @@ function fann_get_cascade_num_candidates($ann)
 /**
  * Returns the cascade output change fraction
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -595,7 +556,6 @@ function fann_get_cascade_output_change_fraction($ann)
 /**
  * Returns the number of cascade output stagnation epochs
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -608,7 +568,6 @@ function fann_get_cascade_output_stagnation_epochs($ann)
 /**
  * Returns the weight multiplier
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -621,7 +580,6 @@ function fann_get_cascade_weight_multiplier($ann)
 /**
  * Get connections in the network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -634,7 +592,6 @@ function fann_get_connection_array($ann)
 /**
  * Get the connection rate used when the network was created
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -647,7 +604,6 @@ function fann_get_connection_rate($ann)
 /**
  * Returns the last error number
  *
- * @stub
  *
  * @param resource $errdat
  *
@@ -660,7 +616,6 @@ function fann_get_errno($errdat)
 /**
  * Returns the last errstr
  *
- * @stub
  *
  * @param resource $errdat
  *
@@ -673,7 +628,6 @@ function fann_get_errstr($errdat)
 /**
  * Get the number of neurons in each layer in the network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -686,7 +640,6 @@ function fann_get_layer_array($ann)
 /**
  * Returns the learning momentum
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -699,7 +652,6 @@ function fann_get_learning_momentum($ann)
 /**
  * Returns the learning rate
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -712,7 +664,6 @@ function fann_get_learning_rate($ann)
 /**
  * Reads the mean square error from the network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -725,7 +676,6 @@ function fann_get_MSE($ann)
 /**
  * Get the type of neural network it was created as
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -738,7 +688,6 @@ function fann_get_network_type($ann)
 /**
  * Get the number of input neurons
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -751,7 +700,6 @@ function fann_get_num_input($ann)
 /**
  * Get the number of layers in the neural network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -764,7 +712,6 @@ function fann_get_num_layers($ann)
 /**
  * Get the number of output neurons
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -777,7 +724,6 @@ function fann_get_num_output($ann)
 /**
  * Returns the decay which is a factor that weights should decrease in each iteration during quickprop training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -790,7 +736,6 @@ function fann_get_quickprop_decay($ann)
 /**
  * Returns the mu factor
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -803,7 +748,6 @@ function fann_get_quickprop_mu($ann)
 /**
  * Returns the increase factor used during RPROP training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -816,7 +760,6 @@ function fann_get_rprop_decrease_factor($ann)
 /**
  * Returns the maximum step-size
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -829,7 +772,6 @@ function fann_get_rprop_delta_max($ann)
 /**
  * Returns the minimum step-size
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -842,7 +784,6 @@ function fann_get_rprop_delta_min($ann)
 /**
  * Returns the initial step-size
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -855,7 +796,6 @@ function fann_get_rprop_delta_zero($ann)
 /**
  * Returns the increase factor used during RPROP training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -868,7 +808,6 @@ function fann_get_rprop_increase_factor($ann)
 /**
  * Returns the sarprop step error shift
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -881,7 +820,6 @@ function fann_get_sarprop_step_error_shift($ann)
 /**
  * Returns the sarprop step error threshold factor
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -894,7 +832,6 @@ function fann_get_sarprop_step_error_threshold_factor($ann)
 /**
  * Returns the sarprop temperature
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -907,7 +844,6 @@ function fann_get_sarprop_temperature($ann)
 /**
  * Returns the sarprop weight decay shift
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -920,7 +856,6 @@ function fann_get_sarprop_weight_decay_shift($ann)
 /**
  * Get the total number of connections in the entire network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -933,7 +868,6 @@ function fann_get_total_connections($ann)
 /**
  * Get the total number of neurons in the entire network
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -946,7 +880,6 @@ function fann_get_total_neurons($ann)
 /**
  * Returns the error function used during training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -959,7 +892,6 @@ function fann_get_train_error_function($ann)
 /**
  * Returns the training algorithm
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -972,7 +904,6 @@ function fann_get_training_algorithm($ann)
 /**
  * Returns the stop function used during training
  *
- * @stub
  *
  * @param resource $ann
  *
@@ -985,7 +916,6 @@ function fann_get_train_stop_function($ann)
 /**
  * Initialize the weights using Widrow + Nguyen’s algorithm
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -999,7 +929,6 @@ function fann_init_weights($ann, $train_data)
 /**
  * Returns the number of training patterns in the train data
  *
- * @stub
  *
  * @param resource $data
  *
@@ -1012,7 +941,6 @@ function fann_length_train_data($data)
 /**
  * Merges the train data
  *
- * @stub
  *
  * @param resource $data1
  * @param resource $data2
@@ -1026,7 +954,6 @@ function fann_merge_train_data($data1, $data2)
 /**
  * Returns the number of inputs in each of the training patterns in the train data
  *
- * @stub
  *
  * @param resource $data
  *
@@ -1039,7 +966,6 @@ function fann_num_input_train_data($data)
 /**
  * Returns the number of outputs in each of the training patterns in the train data
  *
- * @stub
  *
  * @param resource $data
  *
@@ -1052,7 +978,6 @@ function fann_num_output_train_data($data)
 /**
  * Prints the error string
  *
- * @stub
  *
  * @param string $errdat
  *
@@ -1065,7 +990,6 @@ function fann_print_error($errdat)
 /**
  * Give each connection a random weight between min_weight and max_weight
  *
- * @stub
  *
  * @param resource $ann
  * @param float $min_weight
@@ -1080,7 +1004,6 @@ function fann_randomize_weights($ann, $min_weight, $max_weight)
 /**
  * Reads a file that stores training data
  *
- * @stub
  *
  * @param string $filename
  *
@@ -1093,7 +1016,6 @@ function fann_read_train_from_file($filename)
 /**
  * Resets the last error number
  *
- * @stub
  *
  * @param resource $errdat
  *
@@ -1106,7 +1028,6 @@ function fann_reset_errno($errdat)
 /**
  * Resets the last error string
  *
- * @stub
  *
  * @param resource $errdat
  *
@@ -1119,7 +1040,6 @@ function fann_reset_errstr($errdat)
 /**
  * Resets the mean square error from the network
  *
- * @stub
  *
  * @param string $ann
  *
@@ -1132,7 +1052,6 @@ function fann_reset_MSE($ann)
 /**
  * Will run input through the neural network
  *
- * @stub
  *
  * @param resource $ann
  * @param array $input
@@ -1146,7 +1065,6 @@ function fann_run($ann, $input)
 /**
  * Saves the entire network to a configuration file
  *
- * @stub
  *
  * @param resource $ann
  * @param string $configuration_file
@@ -1160,7 +1078,6 @@ function fann_save($ann, $configuration_file)
 /**
  * Save the training structure to a file
  *
- * @stub
  *
  * @param resource $data
  * @param string $file_name
@@ -1174,7 +1091,6 @@ function fann_save_train($data, $file_name)
 /**
  * Scale data in input vector before feed it to ann based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param array $input_vector
@@ -1188,7 +1104,6 @@ function fann_scale_input($ann, $input_vector)
 /**
  * Scales the inputs in the training data to the specified range
  *
- * @stub
  *
  * @param resource $train_data
  * @param float $new_min
@@ -1203,7 +1118,6 @@ function fann_scale_input_train_data($train_data, $new_min, $new_max)
 /**
  * Scale data in output vector before feed it to ann based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param array $output_vector
@@ -1217,7 +1131,6 @@ function fann_scale_output($ann, $output_vector)
 /**
  * Scales the outputs in the training data to the specified range
  *
- * @stub
  *
  * @param resource $train_data
  * @param float $new_min
@@ -1232,7 +1145,6 @@ function fann_scale_output_train_data($train_data, $new_min, $new_max)
 /**
  * Scales the inputs and outputs in the training data to the specified range
  *
- * @stub
  *
  * @param resource $train_data
  * @param float $new_min
@@ -1247,7 +1159,6 @@ function fann_scale_train_data($train_data, $new_min, $new_max)
 /**
  * Scale input and output data based on previously calculated parameters
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -1261,7 +1172,6 @@ function fann_scale_train($ann, $train_data)
 /**
  * Sets the activation function for all of the hidden layers
  *
- * @stub
  *
  * @param resource $ann
  * @param int $activation_function
@@ -1275,7 +1185,6 @@ function fann_set_activation_function_hidden($ann, $activation_function)
 /**
  * Sets the activation function for all the neurons in the supplied layer.
  *
- * @stub
  *
  * @param resource $ann
  * @param int $activation_function
@@ -1290,7 +1199,6 @@ function fann_set_activation_function_layer($ann, $activation_function, $layer)
 /**
  * Sets the activation function for the output layer
  *
- * @stub
  *
  * @param resource $ann
  * @param int $activation_function
@@ -1304,7 +1212,6 @@ function fann_set_activation_function_output($ann, $activation_function)
 /**
  * Sets the activation function for supplied neuron and layer
  *
- * @stub
  *
  * @param resource $ann
  * @param int $activation_function
@@ -1320,7 +1227,6 @@ function fann_set_activation_function($ann, $activation_function, $layer, $neuro
 /**
  * Sets the steepness of the activation steepness for all neurons in the all hidden layers
  *
- * @stub
  *
  * @param resource $ann
  * @param float $activation_steepness
@@ -1334,7 +1240,6 @@ function fann_set_activation_steepness_hidden($ann, $activation_steepness)
 /**
  * Sets the activation steepness for all of the neurons in the supplied layer number
  *
- * @stub
  *
  * @param resource $ann
  * @param float $activation_steepness
@@ -1349,7 +1254,6 @@ function fann_set_activation_steepness_layer($ann, $activation_steepness, $layer
 /**
  * Sets the steepness of the activation steepness in the output layer
  *
- * @stub
  *
  * @param resource $ann
  * @param float $activation_steepness
@@ -1363,7 +1267,6 @@ function fann_set_activation_steepness_output($ann, $activation_steepness)
 /**
  * Sets the activation steepness for supplied neuron and layer number
  *
- * @stub
  *
  * @param resource $ann
  * @param float $activation_steepness
@@ -1379,7 +1282,6 @@ function fann_set_activation_steepness($ann, $activation_steepness, $layer, $neu
 /**
  * Set the bit fail limit used during training
  *
- * @stub
  *
  * @param resource $ann
  * @param float $bit_fail_limit
@@ -1393,7 +1295,6 @@ function fann_set_bit_fail_limit($ann, $bit_fail_limit)
 /**
  * Sets the callback function for use during training
  *
- * @stub
  *
  * @param resource $ann
  * @param collable $callback
@@ -1407,7 +1308,6 @@ function fann_set_callback($ann, $callback)
 /**
  * Sets the array of cascade candidate activation functions
  *
- * @stub
  *
  * @param resource $ann
  * @param array $cascade_activation_functions
@@ -1421,7 +1321,6 @@ function fann_set_cascade_activation_functions($ann, $cascade_activation_functio
 /**
  * Sets the array of cascade candidate activation steepnesses
  *
- * @stub
  *
  * @param resource $ann
  * @param array $cascade_activation_steepnesses_count
@@ -1435,7 +1334,6 @@ function fann_set_cascade_activation_steepnesses($ann, $cascade_activation_steep
 /**
  * Sets the cascade candidate change fraction
  *
- * @stub
  *
  * @param resource $ann
  * @param float $cascade_candidate_change_fraction
@@ -1449,7 +1347,6 @@ function fann_set_cascade_candidate_change_fraction($ann, $cascade_candidate_cha
 /**
  * Sets the candidate limit
  *
- * @stub
  *
  * @param resource $ann
  * @param float $cascade_candidate_limit
@@ -1463,7 +1360,6 @@ function fann_set_cascade_candidate_limit($ann, $cascade_candidate_limit)
 /**
  * Sets the number of cascade candidate stagnation epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_candidate_stagnation_epochs
@@ -1477,7 +1373,6 @@ function fann_set_cascade_candidate_stagnation_epochs($ann, $cascade_candidate_s
 /**
  * Sets the max candidate epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_max_cand_epochs
@@ -1491,7 +1386,6 @@ function fann_set_cascade_max_cand_epochs($ann, $cascade_max_cand_epochs)
 /**
  * Sets the maximum out epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_max_out_epochs
@@ -1505,7 +1399,6 @@ function fann_set_cascade_max_out_epochs($ann, $cascade_max_out_epochs)
 /**
  * Sets the min candidate epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_min_cand_epochs
@@ -1519,7 +1412,6 @@ function fann_set_cascade_min_cand_epochs($ann, $cascade_min_cand_epochs)
 /**
  * Sets the minimum out epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_min_out_epochs
@@ -1533,7 +1425,6 @@ function fann_set_cascade_min_out_epochs($ann, $cascade_min_out_epochs)
 /**
  * Sets the number of candidate groups
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_num_candidate_groups
@@ -1547,7 +1438,6 @@ function fann_set_cascade_num_candidate_groups($ann, $cascade_num_candidate_grou
 /**
  * Sets the cascade output change fraction
  *
- * @stub
  *
  * @param resource $ann
  * @param float $cascade_output_change_fraction
@@ -1561,7 +1451,6 @@ function fann_set_cascade_output_change_fraction($ann, $cascade_output_change_fr
 /**
  * Sets the number of cascade output stagnation epochs
  *
- * @stub
  *
  * @param resource $ann
  * @param int $cascade_output_stagnation_epochs
@@ -1575,7 +1464,6 @@ function fann_set_cascade_output_stagnation_epochs($ann, $cascade_output_stagnat
 /**
  * Sets the weight multiplier
  *
- * @stub
  *
  * @param resource $ann
  * @param float $cascade_weight_multiplier
@@ -1589,7 +1477,6 @@ function fann_set_cascade_weight_multiplier($ann, $cascade_weight_multiplier)
 /**
  * Sets where the errors are logged to
  *
- * @stub
  *
  * @param resource $errdat
  * @param string $log_file
@@ -1603,7 +1490,6 @@ function fann_set_error_log($errdat, $log_file)
 /**
  * Calculate input scaling parameters for future use based on training data
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -1619,7 +1505,6 @@ function fann_set_input_scaling_params($ann, $train_data, $new_input_min, $new_i
 /**
  * Sets the learning momentum
  *
- * @stub
  *
  * @param resource $ann
  * @param float $learning_momentum
@@ -1633,7 +1518,6 @@ function fann_set_learning_momentum($ann, $learning_momentum)
 /**
  * Sets the learning rate
  *
- * @stub
  *
  * @param resource $ann
  * @param float $learning_rate
@@ -1647,7 +1531,6 @@ function fann_set_learning_rate($ann, $learning_rate)
 /**
  * Calculate output scaling parameters for future use based on training data
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -1663,7 +1546,6 @@ function fann_set_output_scaling_params($ann, $train_data, $new_output_min, $new
 /**
  * Sets the quickprop decay factor
  *
- * @stub
  *
  * @param resource $ann
  * @param float $quickprop_decay
@@ -1677,7 +1559,6 @@ function fann_set_quickprop_decay($ann, $quickprop_decay)
 /**
  * Sets the quickprop mu factor
  *
- * @stub
  *
  * @param resource $ann
  * @param float $quickprop_mu
@@ -1691,7 +1572,6 @@ function fann_set_quickprop_mu($ann, $quickprop_mu)
 /**
  * Sets the decrease factor used during RPROP training
  *
- * @stub
  *
  * @param resource $ann
  * @param float $rprop_decrease_factor
@@ -1705,7 +1585,6 @@ function fann_set_rprop_decrease_factor($ann, $rprop_decrease_factor)
 /**
  * Sets the maximum step-size
  *
- * @stub
  *
  * @param resource $ann
  * @param float $rprop_delta_max
@@ -1719,7 +1598,6 @@ function fann_set_rprop_delta_max($ann, $rprop_delta_max)
 /**
  * Sets the minimum step-size
  *
- * @stub
  *
  * @param resource $ann
  * @param float $rprop_delta_min
@@ -1733,7 +1611,6 @@ function fann_set_rprop_delta_min($ann, $rprop_delta_min)
 /**
  * Sets the initial step-size
  *
- * @stub
  *
  * @param resource $ann
  * @param float $rprop_delta_zero
@@ -1747,7 +1624,6 @@ function fann_set_rprop_delta_zero($ann, $rprop_delta_zero)
 /**
  * Sets the increase factor used during RPROP training
  *
- * @stub
  *
  * @param resource $ann
  * @param float $rprop_increase_factor
@@ -1761,7 +1637,6 @@ function fann_set_rprop_increase_factor($ann, $rprop_increase_factor)
 /**
  * Sets the sarprop step error shift
  *
- * @stub
  *
  * @param resource $ann
  * @param float $sarprop_step_error_shift
@@ -1775,7 +1650,6 @@ function fann_set_sarprop_step_error_shift($ann, $sarprop_step_error_shift)
 /**
  * Sets the sarprop step error threshold factor
  *
- * @stub
  *
  * @param resource $ann
  * @param float $sarprop_step_error_threshold_factor
@@ -1789,7 +1663,6 @@ function fann_set_sarprop_step_error_threshold_factor($ann, $sarprop_step_error_
 /**
  * Sets the sarprop temperature
  *
- * @stub
  *
  * @param resource $ann
  * @param float $sarprop_temperature
@@ -1803,7 +1676,6 @@ function fann_set_sarprop_temperature($ann, $sarprop_temperature)
 /**
  * Sets the sarprop weight decay shift
  *
- * @stub
  *
  * @param resource $ann
  * @param float $sarprop_weight_decay_shift
@@ -1817,7 +1689,6 @@ function fann_set_sarprop_weight_decay_shift($ann, $sarprop_weight_decay_shift)
 /**
  * Calculate input and output scaling parameters for future use based on training data
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $train_data
@@ -1835,7 +1706,6 @@ function fann_set_scaling_params($ann, $train_data, $new_input_min, $new_input_m
 /**
  * Sets the error function used during training
  *
- * @stub
  *
  * @param resource $ann
  * @param int $error_function
@@ -1849,7 +1719,6 @@ function fann_set_train_error_function($ann, $error_function)
 /**
  * Sets the training algorithm
  *
- * @stub
  *
  * @param resource $ann
  * @param int $training_algorithm
@@ -1863,7 +1732,6 @@ function fann_set_training_algorithm($ann, $training_algorithm)
 /**
  * Sets the stop function used during training
  *
- * @stub
  *
  * @param resource $ann
  * @param int $stop_function
@@ -1877,7 +1745,6 @@ function fann_set_train_stop_function($ann, $stop_function)
 /**
  * Set connections in the network
  *
- * @stub
  *
  * @param resource $ann
  * @param array $connections
@@ -1891,7 +1758,6 @@ function fann_set_weight_array($ann, $connections)
 /**
  * Set a connection in the network
  *
- * @stub
  *
  * @param resource $ann
  * @param int $from_neuron
@@ -1907,7 +1773,6 @@ function fann_set_weight($ann, $from_neuron, $to_neuron, $weight)
 /**
  * Shuffles training data, randomizing the order
  *
- * @stub
  *
  * @param resource $train_data
  *
@@ -1920,7 +1785,6 @@ function fann_shuffle_train_data($train_data)
 /**
  * Returns an copy of a subset of the train data
  *
- * @stub
  *
  * @param resource $data
  * @param int $pos
@@ -1935,7 +1799,6 @@ function fann_subset_train_data($data, $pos, $length)
 /**
  * Test a set of training data and calculates the MSE for the training data
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $data
@@ -1949,7 +1812,6 @@ function fann_test_data($ann, $data)
 /**
  * Test with a set of inputs, and a set of desired outputs
  *
- * @stub
  *
  * @param resource $ann
  * @param array $input
@@ -1964,7 +1826,6 @@ function fann_test($ann, $input, $desired_output)
 /**
  * Train one epoch with a set of training data
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $data
@@ -1978,7 +1839,6 @@ function fann_train_epoch($ann, $data)
 /**
  * Trains on an entire dataset for a period of time
  *
- * @stub
  *
  * @param resource $ann
  * @param resource $data
@@ -1995,7 +1855,6 @@ function fann_train_on_data($ann, $data, $max_epochs, $epochs_between_reports, $
 /**
  * Trains on an entire dataset, which is read from file, for a period of time
  *
- * @stub
  *
  * @param resource $ann
  * @param string $filename
@@ -2012,7 +1871,6 @@ function fann_train_on_file($ann, $filename, $max_epochs, $epochs_between_report
 /**
  * Train one iteration with a set of inputs, and a set of desired outputs
  *
- * @stub
  *
  * @param resource $ann
  * @param array $input
diff --git a/gnupg/gnupg.php b/gnupg/gnupg.php
index e2d560d4..40d18a48 100644
--- a/gnupg/gnupg.php
+++ b/gnupg/gnupg.php
@@ -38,7 +38,6 @@ class gnupg {
 	/**
 	 * Add a key for decryption
 	 * @link https://php.net/manual/en/function.gnupg-adddecryptkey.php
-	 * @phpstub
 	 *
 	 * @param string $fingerprint
 	 * @param string $passphrase
@@ -52,7 +51,6 @@ class gnupg {
 	/**
 	 * Verifies a signed text
 	 * @link https://php.net/manual/en/function.gnupg-verify.php
-	 * @phpstub
 	 *
 	 * * @param string $signed_text
 	 * @param string $signature
@@ -68,7 +66,6 @@ class gnupg {
 	/**
 	 * Add a key for encryption
 	 * @link https://php.net/manual/en/function.gnupg-addencryptkey.php
-	 * @phpstub
 	 *
 	 * @param string $fingerprint
 	 *
@@ -81,7 +78,6 @@ class gnupg {
 	/**
 	 * Add a key for signing
 	 * @link https://php.net/manual/en/function.gnupg-addsignkey.php
-	 * @phpstub
 	 *
 	 * @param string $fingerprint
 	 * @param string $passphrase
@@ -95,7 +91,6 @@ class gnupg {
 	/**
 	 * Removes all keys which were set for decryption before
 	 * @link https://php.net/manual/en/function.gnupg-cleardecryptkeys.php
-	 * @phpstub
 	 *
 	 * @return bool
 	 */
@@ -106,8 +101,6 @@ class gnupg {
 	/**
 	 * Removes all keys which were set for encryption before
 	 * @link https://php.net/manual/en/function.gnupg-clearencryptkeys.php
-	 * @phpstub
-	 *
 	 *
 	 * @return bool
 	 */
@@ -118,8 +111,6 @@ class gnupg {
 	/**
 	 * Removes all keys which were set for signing before
 	 * @link https://php.net/manual/en/function.gnupg-clearsignkeys.php
-	 * @phpstub
-	 *
 	 *
 	 * @return bool
 	 */
@@ -130,7 +121,6 @@ class gnupg {
 	/**
 	 * Decrypts a given text
 	 * @link https://php.net/manual/en/function.gnupg-decrypt.php
-	 * @phpstub
 	 *
 	 * @param string $text
 	 *
@@ -144,7 +134,6 @@ class gnupg {
 	/**
 	 * Decrypts and verifies a given text
 	 * @link https://php.net/manual/en/function.gnupg-decryptverify.php
-	 * @phpstub
 	 *
 	 * @param string $text
 	 * @param string $plaintext
@@ -160,7 +149,6 @@ class gnupg {
 	/**
 	 * Encrypts a given text
 	 * @link https://php.net/manual/en/function.gnupg-encrypt.php
-	 * @phpstub
 	 *
 	 * @param string $plaintext
 	 *
@@ -174,7 +162,6 @@ class gnupg {
 	/**
 	 * Encrypts and signs a given text
 	 * @link https://php.net/manual/en/function.gnupg-encryptsign.php
-	 * @phpstub
 	 *
 	 * @param string $plaintext
 	 *
@@ -188,7 +175,6 @@ class gnupg {
 	/**
 	 * Exports a key
 	 * @link https://php.net/manual/en/function.gnupg-export.php
-	 * @phpstub
 	 *
 	 * @param string $fingerprint
 	 *
@@ -202,8 +188,6 @@ class gnupg {
 	/**
 	 * Returns the errortext, if a function fails
 	 * @link https://php.net/manual/en/function.gnupg-geterror.php
-	 * @phpstub
-	 *
 	 *
 	 * @return string|false Returns an errortext, if an error has occurred, otherwise false.
 	 */
@@ -214,8 +198,6 @@ class gnupg {
 	/**
 	 * Returns the currently active protocol for all operations
 	 * @link https://php.net/manual/en/function.gnupg-getprotocol.php
-	 * @phpstub
-	 *
 	 *
 	 * @return int Returns the currently active protocol, which can be one of
 	 *             or
@@ -228,7 +210,6 @@ class gnupg {
 	/**
 	 * Imports a key
 	 * @link https://php.net/manual/en/function.gnupg-import.php
-	 * @phpstub
 	 *
 	 * @param string $keydata
 	 *
@@ -242,7 +223,6 @@ class gnupg {
 	/**
 	 * Initialize a connection
 	 * @link https://php.net/manual/en/function.gnupg-init.php
-	 * @phpstub
 	 *
 	 * @return resource A GnuPG ``resource`` connection used by other GnuPG functions.
 	 */
@@ -253,7 +233,6 @@ class gnupg {
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 * @link https://php.net/manual/en/function.gnupg-keyinfo.php
-	 * @phpstub
 	 *
 	 * @param string $pattern
 	 *
@@ -267,7 +246,6 @@ class gnupg {
 	/**
 	 * Toggle armored output
 	 * @link https://php.net/manual/en/function.gnupg-setarmor.php
-	 * @phpstub
 	 *
 	 * @param int $armor
 	 *
@@ -280,7 +258,6 @@ class gnupg {
 	/**
 	 * Sets the mode for error_reporting
 	 * @link https://php.net/manual/en/function.gnupg-seterrormode.php
-	 * @phpstub
 	 *
 	 * @param int $errormode
 	 *
@@ -293,7 +270,6 @@ class gnupg {
 	/**
 	 * Sets the mode for signing
 	 * @link https://php.net/manual/en/function.gnupg-setsignmode.php
-	 * @phpstub
 	 *
 	 * @param int $signmode
 	 *
@@ -306,7 +282,6 @@ class gnupg {
 	/**
 	 * Signs a given text
 	 * @link https://php.net/manual/en/function.gnupg-sign.php
-	 * @phpstub
 	 *
 	 * @param string $plaintext
 	 *
diff --git a/http/http3.php b/http/http3.php
index 63cbf84c..06a75eb6 100644
--- a/http/http3.php
+++ b/http/http3.php
@@ -39,29 +39,25 @@ class Client implements \SplSubject, \Countable {
 	const DEBUG_SSL = 64;
 	/**
 	 * Attached observers.
-	 * 
-	 * @private
+	 *
 	 * @var \SplObjectStorage
 	 */
 	private $observers = NULL;
 	/**
 	 * Set options.
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $options = NULL;
 	/**
 	 * Request/response history.
 	 * 
-	 * @protected
 	 * @var \http\Message
 	 */
 	protected $history = NULL;
 	/**
 	 * Whether to record history in http\Client::$history.
-	 * 
-	 * @public
+	 *
 	 * @var bool
 	 */
 	public $recordHistory = false;
@@ -813,15 +809,13 @@ class Header implements \Serializable {
 	const MATCH_STRICT = 33;
 	/**
 	 * The name of the HTTP header.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $name = NULL;
 	/**
 	 * The value of the HTTP header.
-	 * 
-	 * @public
+	 *
 	 * @var 
 	 */
 	public $value = NULL;
@@ -924,63 +918,54 @@ class Message implements \Countable, \Serializable, \Iterator {
 	/**
 	 * The message type. See http\Message::TYPE_* constants.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $type = \http\Message::TYPE_NONE;
 	/**
 	 * The message's body.
 	 * 
-	 * @protected
 	 * @var \http\Message\Body
 	 */
 	protected $body = NULL;
 	/**
 	 * The request method if the message is of type request.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $requestMethod = "";
 	/**
 	 * The request url if the message is of type request.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $requestUrl = "";
 	/**
 	 * The response status phrase if the message is of type response.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $responseStatus = "";
 	/**
 	 * The response code if the message is of type response.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $responseCode = 0;
 	/**
 	 * A custom HTTP protocol version.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $httpVersion = NULL;
 	/**
 	 * Any message headers.
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $headers = NULL;
 	/**
 	 * Any parent message.
 	 * 
-	 * @protected
 	 * @var \http\Message
 	 */
 	protected $parentMessage;
@@ -1404,36 +1389,31 @@ class Params implements \ArrayAccess {
 	const PARSE_RFC5988 = 32;
 	/**
 	 * The (parsed) parameters.
-	 * 
-	 * @public
+	 *
 	 * @var array
 	 */
 	public $params = NULL;
 	/**
 	 * The parameter separator(s).
-	 * 
-	 * @public
+	 *
 	 * @var array
 	 */
 	public $param_sep = \http\Params::DEF_PARAM_SEP;
 	/**
 	 * The argument separator(s).
-	 * 
-	 * @public
+	 *
 	 * @var array
 	 */
 	public $arg_sep = \http\Params::DEF_ARG_SEP;
 	/**
 	 * The value separator(s).
-	 * 
-	 * @public
+	 *
 	 * @var array
 	 */
 	public $val_sep = \http\Params::DEF_VAL_SEP;
 	/**
 	 * The modus operandi of the parser. See http\Params::PARSE_* constants.
-	 * 
-	 * @public
+	 *
 	 * @var int
 	 */
 	public $flags = \http\Params::PARSE_DEFAULT;
@@ -1526,15 +1506,13 @@ class QueryString implements \Serializable, \ArrayAccess, \IteratorAggregate {
 	const TYPE_OBJECT = 8;
 	/**
 	 * The global instance. See http\QueryString::getGlobalInstance().
-	 * 
-	 * @private
+	 *
 	 * @var \http\QueryString
 	 */
 	private $instance = NULL;
 	/**
 	 * The data.
-	 * 
-	 * @private
+	 *
 	 * @var array
 	 */
 	private $queryArray = NULL;
@@ -1823,57 +1801,49 @@ class Url  {
 	const STDFLAGS = 3350531;
 	/**
 	 * The URL's scheme.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $scheme = NULL;
 	/**
 	 * Authenticating user.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $user = NULL;
 	/**
 	 * Authentication password.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $pass = NULL;
 	/**
 	 * Hostname/domain.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $host = NULL;
 	/**
 	 * Port.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $port = NULL;
 	/**
 	 * URL path.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $path = NULL;
 	/**
 	 * URL querystring.
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $query = NULL;
 	/**
 	 * URL fragment (hash).
-	 * 
-	 * @public
+	 *
 	 * @var string
 	 */
 	public $fragment = NULL;
@@ -2081,7 +2051,6 @@ class Request extends \http\Message {
 	/**
 	 * Array of options for this request, which override client options.
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $options = NULL;
@@ -2628,28 +2597,24 @@ class Request extends \http\Message {
 	/**
 	 * The request's query parameters. ($_GET)
 	 * 
-	 * @protected
 	 * @var \http\QueryString
 	 */
 	protected $query = NULL;
 	/**
 	 * The request's form parameters. ($_POST)
 	 * 
-	 * @protected
 	 * @var \http\QueryString
 	 */
 	protected $form = NULL;
 	/**
 	 * The request's form uploads. ($_FILES)
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $files = NULL;
 	/**
 	 * The request's cookies. ($_COOKIE)
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $cookie = NULL;
@@ -2748,70 +2713,60 @@ class Response extends \http\Message {
 	/**
 	 * A request instance which overrides the environments default request.
 	 * 
-	 * @protected
 	 * @var \http\Env\Request
 	 */
 	protected $request = NULL;
 	/**
 	 * The response's MIME content type.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $contentType = NULL;
 	/**
 	 * The response's MIME content disposition.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $contentDisposition = NULL;
 	/**
 	 * See http\Env\Response::CONTENT_ENCODING_* constants.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $contentEncoding = NULL;
 	/**
 	 * How the client should treat this response in regards to caching.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $cacheControl = NULL;
 	/**
 	 * A custom ETag.
 	 * 
-	 * @protected
 	 * @var string
 	 */
 	protected $etag = NULL;
 	/**
 	 * A "Last-Modified" time stamp.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $lastModified = NULL;
 	/**
 	 * Any throttling delay.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $throttleDelay = NULL;
 	/**
 	 * The chunk to send every $throttleDelay seconds.
 	 * 
-	 * @protected
 	 * @var int
 	 */
 	protected $throttleChunk = NULL;
 	/**
 	 * The response's cookies.
 	 * 
-	 * @protected
 	 * @var array
 	 */
 	protected $cookies = NULL;
diff --git a/imagick/imagick.php b/imagick/imagick.php
index 12c88953..72287ec1 100644
--- a/imagick/imagick.php
+++ b/imagick/imagick.php
@@ -6315,7 +6315,7 @@ class ImagickPixelIterator implements Iterator {
 	 * @link https://php.net/manual/en/imagickpixeliterator.newpixeliterator.php
 	 * @param Imagick $wand
 	 * @return bool <b>TRUE</b> on success. Throwing ImagickPixelIteratorException.
-	 * @throw ImagickPixelIteratorException
+	 * @throws ImagickPixelIteratorException
 	 */
 	public function newPixelIterator (Imagick $wand) {}
 
diff --git a/inotify/inotify.php b/inotify/inotify.php
index 57e3762c..46fb6fa4 100644
--- a/inotify/inotify.php
+++ b/inotify/inotify.php
@@ -84,117 +84,94 @@ function inotify_rm_watch( $inotify_instance, $watch_descriptor )
 }
 
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ACCESS = 1;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MODIFY = 2;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ATTRIB = 4;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_CLOSE_WRITE = 8;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_CLOSE_NOWRITE = 16;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_OPEN = 32;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MOVED_FROM = 64;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MOVED_TO = 128;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_CREATE = 256;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_DELETE = 512;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_DELETE_SELF = 1024;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MOVE_SELF = 2048;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_UNMOUNT = 8192;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_Q_OVERFLOW = 16384;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_IGNORED = 32768;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_CLOSE = 24;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MOVE = 192;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ALL_EVENTS = 4095;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ONLYDIR = 16777216;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_DONT_FOLLOW = 33554432;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_MASK_ADD = 536870912;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ISDIR = 1073741824;
 /**
- * @type int
  * @link https://php.net/manual/en/inotify.constants.php
  */
 const IN_ONESHOT = 2147483648;
diff --git a/mongo/mongo.php b/mongo/mongo.php
index 740eaa14..eec3a4b6 100644
--- a/mongo/mongo.php
+++ b/mongo/mongo.php
@@ -149,7 +149,6 @@ class MongoClient
     /**
      * Get connections
      * Returns an array of all open connections, and information about each of the servers
-     * @static
      * @return array
      */
     static public function getConnections ()
@@ -1239,7 +1238,6 @@ class MongoCollection {
 
     /**
     * @param  mixed $keys
-    * @static
     * @return string 
     */
     protected static function toIndexString($keys) {}
@@ -1263,7 +1261,6 @@ class MongoCollection {
 class MongoCursor implements Iterator {
     /**
      * @link https://php.net/manual/en/class.mongocursor.php#mongocursor.props.slaveokay
-	 * @static
      * @var bool $slaveOkay
      */
     public static $slaveOkay = FALSE;
@@ -1840,7 +1837,6 @@ class MongoGridFSFile {
 
 class MongoGridFSCursor extends MongoCursor implements Traversable, Iterator {
     /**
-    * @static
     * @var $slaveOkay
     */
     public static $slaveOkay;
@@ -2133,13 +2129,11 @@ class MongoBinData {
 
 class MongoDBRef {
     /**
-    * @static
     * @var $refKey
     */
     protected static $refKey = '$ref';
 
     /**
-    * @static
     * @var $idKey
     */
     protected static $idKey = '$id';
@@ -2148,7 +2142,6 @@ class MongoDBRef {
      * If no database is given, the current database is used.
      *
      * @link https://php.net/manual/en/mongodbref.create.php
-     * @static
      * @param string $collection Collection name (without the database name)
      * @param mixed $id The _id field of the object to which to link
      * @param string $database Database name
@@ -2161,7 +2154,6 @@ class MongoDBRef {
      * It merely checks that $ref is in valid database reference format (in that it is an object or array with $ref and $id fields).
      *
      * @link https://php.net/manual/en/mongodbref.isref.php
-     * @static
      * @param mixed $ref Array or object to check
      * @return bool Returns true if $ref is a reference
      */
@@ -2170,7 +2162,6 @@ class MongoDBRef {
     /**
      * Fetches the object pointed to by a reference
      * @link https://php.net/manual/en/mongodbref.get.php
-     * @static
      * @param MongoDB $db Database to use
      * @param array $ref Reference to fetch
      * @return array|null Returns the document to which the reference refers or null if the document does not exist (the reference is broken)
@@ -2547,7 +2538,6 @@ class MongoLog {
      * section with bitwise operators to specify levels.
      *
      * @link https://php.net/manual/en/mongolog.setlevel.php
-     * @static
      * @param int $level The levels you would like to log
      * @return void
      */
@@ -2558,7 +2548,6 @@ class MongoLog {
      * MongoLog section with bitwise operators to check the level.
      *
      * @link https://php.net/manual/en/mongolog.getlevel.php
-     * @static
      * @return int Returns the current level
      */
     public static function getLevel() {}
@@ -2569,7 +2558,6 @@ class MongoLog {
      * bitwise operators to specify modules.
      *
      * @link https://php.net/manual/en/mongolog.setmodule.php
-     * @static
      * @param int $module The module(s) you would like to log
      * @return void
      */
@@ -2581,7 +2569,6 @@ class MongoLog {
      * operators to check if specific modules are being logged.
      *
      * @link https://php.net/manual/en/mongolog.getmodule.php
-     * @static
      * @return int Returns the modules currently being logged
      */
     public static function getModule() {}
@@ -2592,7 +2579,6 @@ class MongoPool {
      * Returns an array of information about all connection pools.
      *
      * @link https://php.net/manual/en/mongopool.info.php
-     * @static
      * @return array Each connection pool has an identifier, which starts with the host. For
      *         each pool, this function shows the following fields: $in use The number of
      *         connections currently being used by Mongo instances. $in pool The number of
@@ -2620,7 +2606,6 @@ class MongoPool {
      * Sets the max number of connections new pools will be able to create.
      *
      * @link https://php.net/manual/en/mongopool.setsize.php
-     * @static
      * @param int $size The max number of connections future pools will be able to
      *        create. Negative numbers mean that the pool will spawn an infinite number of
      *        connections
@@ -2632,7 +2617,6 @@ class MongoPool {
      * .
      *
      * @link https://php.net/manual/en/mongopool.getsize.php
-     * @static
      * @return int Returns the current pool size
      */
     public static function getSize() {}
diff --git a/mongodb/mongodb.php b/mongodb/mongodb.php
index 571209bf..38790f81 100644
--- a/mongodb/mongodb.php
+++ b/mongodb/mongodb.php
@@ -886,7 +886,7 @@ namespace MongoDB {}
              * @link https://php.net/manual/en/mongodb-driver-bulkwrite.insert.php
              * @param array|object $document
              * @return mixed
-             * @Throws MongoDB\Driver\InvalidArgumentException on argument parsing errors.
+             * @throws InvalidArgumentException on argument parsing errors.
              */
             public final function insert($document)
             {
diff --git a/mqseries/mqseries.php b/mqseries/mqseries.php
index 0f9880d7..262e2ba7 100644
--- a/mqseries/mqseries.php
+++ b/mqseries/mqseries.php
@@ -9,7 +9,7 @@ function mqseries_back($hconn, &$compCode, &$reason)
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param array $beginOptions
  * @param resource $compCode
@@ -19,7 +19,7 @@ function mqseries_begin($hconn, array $beginOptions, &$compCode, &$reason)
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param resource $hobj
  * @param int $options
@@ -39,7 +39,7 @@ function mqseries_cmit($hconn, &$compCode, &$reason)
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param string $qManagerName
  * @param resource $hconn
  * @param resource $compCode
@@ -49,7 +49,7 @@ function mqseries_conn($qManagerName, &$hconn, &$compCode, &$reason)
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param string $qManagerName
  * @param array $connOptions
  * @param resource $hconn
@@ -69,7 +69,7 @@ function mqseries_disc($hconn, &$compCode, &$reason)
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hConn
  * @param resource $hObj
  * @param array $md
@@ -84,7 +84,7 @@ function mqseries_get($hConn, $hObj, array &$md, array &$gmo, &$bufferLength, &$
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param resource $hobj
  * @param int $selectorCount
@@ -100,7 +100,7 @@ function mqseries_inq($hconn, $hobj, $selectorCount, array $selectors, $intAttrC
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param array $objDesc
  * @param int $option
@@ -112,7 +112,7 @@ function mqseries_open($hconn, array &$objDesc, $option, &$hobj, &$compCode, &$r
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param resource $objDesc
  * @param resource $msgDesc
@@ -125,7 +125,7 @@ function mqseries_put1($hconn, &$objDesc, &$msgDesc, &$pmo, $buffer, &$compCode,
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hConn
  * @param resource $hObj
  * @param array $md
@@ -138,7 +138,7 @@ function mqseries_put($hConn, $hObj, array &$md, array &$pmo, $message, &$compCo
 {
 }
 
-/** @noinspection MoreThanThreeArgumentsInspection
+/**
  * @param resource $hconn
  * @param resource $hobj
  * @param int $selectorcount
diff --git a/oauth/oauth.php b/oauth/oauth.php
index 6e4e834d..8742efff 100644
--- a/oauth/oauth.php
+++ b/oauth/oauth.php
@@ -312,8 +312,6 @@ class OAuthProvider {
      * @param int $size
      * @param bool $strong
      * @return string
-     * @static
-     * @final
      */
     final public static function generateToken($size, $strong = false) { }
 
@@ -332,16 +330,13 @@ class OAuthProvider {
     /**
      * @param string $req_params
      * @return bool
-     * @final
      */
     final public function removeRequiredParameter($req_params) { }
 
     /**
      * @param string $oauthexception
      * @param bool $send_headers
-     * @static
      * @return string
-     * @final
      */
     final public static function reportProblem($oauthexception, $send_headers = true) { }
 
@@ -349,7 +344,6 @@ class OAuthProvider {
      * @param string $param_key
      * @param mixed $param_val
      * @return bool
-     * @final
      */
     final public function setParam($param_key, $param_val = null) { }
 
@@ -357,7 +351,6 @@ class OAuthProvider {
     /**
      * @param string $path
      * @return bool
-     * @final
      */
     final public function setRequestTokenPath($path) { }
 
diff --git a/pcntl/pcntl.php b/pcntl/pcntl.php
index b1795307..e3543225 100644
--- a/pcntl/pcntl.php
+++ b/pcntl/pcntl.php
@@ -457,7 +457,7 @@ function pcntl_async_signals($on = null) {}
 function pcntl_signal_get_handler($signo) {}
 
 /**
- * @sine 7.4
+ * @since 7.4
  */
 function pcntl_unshare($flags){}
 
diff --git a/standard/standard_5.php b/standard/standard_5.php
index 1ae561fa..ff1f785e 100644
--- a/standard/standard_5.php
+++ b/standard/standard_5.php
@@ -366,9 +366,7 @@ function popen ($command, $mode) {}
  * @param resource $context [optional] <p>
  * A context stream resource.
  * </p>
- * @return false|int the number of bytes read from the file. If an error
- * occurs, false is returned and unless the function was called as
- * @readfile, an error message is printed.
+ * @return false|int the number of bytes read from the file, or FALSE on failure
  */
 function readfile ($filename, $use_include_path = null, $context = null) {}
 
diff --git a/standard/standard_8.php b/standard/standard_8.php
index 7b1d7703..e0fd5a6b 100644
--- a/standard/standard_8.php
+++ b/standard/standard_8.php
@@ -68,7 +68,7 @@ function closelog () {}
  * Registers a function that will be called when PHP starts sending output.
  * The callback is executed just after PHP prepares all headers to be sent,<br>
  * and before any other output is sent, creating a window to manipulate the outgoing headers before being sent.
- * @linkhttps://secure.php.net/manual/en/function.header-register-callback.php
+ * @link https://secure.php.net/manual/en/function.header-register-callback.php
  * @param callable $callback Function called just before the headers are sent.
  * @return bool true on success or false on failure.
  */
diff --git a/winbinder/winbinder.php b/winbinder/winbinder.php
index bc5eb594..698126a2 100644
--- a/winbinder/winbinder.php
+++ b/winbinder/winbinder.php
@@ -1,4 +1,4 @@
-<?php /** @noinspection ALL */
+<?php
 
 /**
  * Stub file - DO NOT INCLUDE! = For PHPStorm to analyse.
diff --git a/xhprof/xhprof.php b/xhprof/xhprof.php
index 92a558c5..37454a76 100644
--- a/xhprof/xhprof.php
+++ b/xhprof/xhprof.php
@@ -57,17 +57,14 @@ function xhprof_sample_disable()
 }
 
 /**
- * @type int
  * @link https://php.net/manual/en/xhprof.constants.php#constant.xhprof-flags-no-builtins
  */
 const XHPROF_FLAGS_NO_BUILTINS = 1;
 /**
- * @type int
  * @link https://php.net/manual/en/xhprof.constants.php#constant.xhprof-flags-cpu
  */
 const XHPROF_FLAGS_CPU = 2;
 /**
- * @type int
  * @link https://php.net/manual/en/xhprof.constants.php##constant.xhprof-flags-memory
  */
 const XHPROF_FLAGS_MEMORY = 4;
diff --git a/yaml/yaml.php b/yaml/yaml.php
index 138fdc89..6652633f 100644
--- a/yaml/yaml.php
+++ b/yaml/yaml.php
@@ -37,16 +37,24 @@ define('YAML_UTF16LE_ENCODING', 2);
 define('YAML_UTF16BE_ENCODING', 3);
 
 /**
- * Linebreak types for yaml_emit()
+ * Let emitter choose linebreak character.
  * @link https://php.net/manual/en/yaml.constants.php
- * @const YAML_ANY_BREAK Let emitter choose linebreak character.
- * @const YAML_CR_BREAK Use \r as break character (Mac style).
- * @const YAML_LN_BREAK Use \n as break character (Unix style).
- * @const YAML_CRLN_BREAK Use \r\n as break character (DOS style).
  */
 define('YAML_ANY_BREAK', 0);
+/**
+ * Use \r as break character (Mac style).
+ * @link https://php.net/manual/en/yaml.constants.php
+ */
 define('YAML_CR_BREAK', 1);
+/**
+ * Use \n as break character (Unix style).
+ * @link https://php.net/manual/en/yaml.constants.php
+ */
 define('YAML_LN_BREAK', 2);
+/**
+ * Use \r\n as break character (DOS style).
+ * @link https://php.net/manual/en/yaml.constants.php
+ */
 define('YAML_CRLN_BREAK', 3);
 
 define('YAML_MERGE_TAG', 'tag:yaml.org,2002:merge');
diff --git a/zend/zend.php b/zend/zend.php
index 3e3e1656..06153a2b 100644
--- a/zend/zend.php
+++ b/zend/zend.php
@@ -634,7 +634,6 @@ class java {
      *
      * @return java
      * @param  $classname string
-     * @vararg ...
      */
     function java($classname) {}
 
diff --git a/zend/zend_f.php b/zend/zend_f.php
index a13af462..3ca2b739 100644
--- a/zend/zend_f.php
+++ b/zend/zend_f.php
@@ -23,7 +23,6 @@ function jobqueue_license_info(){};
  *
  * @return object
  * @param string $class
- * @vararg ...
  */
 function java($class) {}
 
diff --git a/zlib/zlib.php b/zlib/zlib.php
index b528a54d..573f279e 100644
--- a/zlib/zlib.php
+++ b/zlib/zlib.php
@@ -13,10 +13,7 @@
  * You can set this optional parameter to 1, if you
  * want to search for the file in the include_path too.
  * </p>
- * @return int the number of (uncompressed) bytes read from the file. If
- * an error occurs, <b>FALSE</b> is returned and unless the function was
- * called as @readgzfile, an error message is
- * printed.
+ * @return int the number of (uncompressed) bytes read from the file, or FALSE on error
  */
 function readgzfile ($filename, $use_include_path = 0) {}