Merge pull request #6168 from mongosoft/fixes

.scrutinizer.yml

@@ -4,7 +4,7 @@ imports:
 tools:
     external_code_coverage:
         timeout: 2100 # Timeout in seconds.
-    # disable copy paste detector and simliarity analyzer as they have no real value
+    # disable copy paste detector and similarity analyzer as they have no real value
     # and a huge bunch of false-positives
     php_sim: false
     php_cpd: false

extensions/elasticsearch/ActiveRecord.php

@@ -244,7 +244,7 @@ class ActiveRecord extends BaseActiveRecord
      * The primaryKey for elasticsearch documents is the `_id` field by default. This field is not part of the
      * ActiveRecord attributes so you should never add `_id` to the list of [[attributes()|attributes]].
      *
-     * You may overide this method to define the primary key name when you have defined
+     * You may override this method to define the primary key name when you have defined
      * [path mapping](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-id-field.html)
      * for the `_id` field so that it is part of the `_source` and thus part of the [[attributes()|attributes]].
      *

framework/i18n/Formatter.php

@@ -1107,7 +1107,7 @@ class Formatter extends Component
     /**
      * Creates a number formatter based on the given type and format.
      *
-     * You may overide this method to create a number formatter based on patterns.
+     * You may override this method to create a number formatter based on patterns.
      *
      * @param integer $style the type of the number formatter.
      * Values: NumberFormatter::DECIMAL, ::CURRENCY, ::PERCENT, ::SCIENTIFIC, ::SPELLOUT, ::ORDINAL

framework/i18n/GettextMessageSource.php

@@ -12,7 +12,7 @@ use Yii;
 /**
  * GettextMessageSource represents a message source that is based on GNU Gettext.
  *
- * Each GettextMessageSource instance represents the message tranlations
+ * Each GettextMessageSource instance represents the message translations
  * for a single domain. And each message category represents a message context
  * in Gettext. Translated messages are stored as either a MO or PO file,
  * depending on the [[useMoFile]] property value.

framework/widgets/FragmentCache.php

@@ -152,7 +152,7 @@ class FragmentCache extends Widget
     }
 
     /**
-     * Replaces placeholders in content by results of evaluated dynamic statemens
+     * Replaces placeholders in content by results of evaluated dynamic statements.
      *
      * @param string $content
      * @param array $placeholders