Permalink
Browse files

Fixing a few typos and grammatical errors

  • Loading branch information...
1 parent 59dd4af commit 7efcd55eb23492d88e74f1437997d77b32ff7053 @mikegreiling mikegreiling committed Mar 22, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 action/Request.php
  2. +1 −1 data/Connections.php
  3. +1 −1 net/http/Response.php
  4. +1 −1 net/http/Router.php
View
@@ -440,7 +440,7 @@ public function is($flag) {
/**
* Sets/Gets the content type. If `'type'` is null, the method will attempt to determine the
- * type first, from the params, then from the environment setting
+ * type from the params, then from the environment setting
*
* @param string $type a full content type i.e. `'application/json'` or simple name `'json'`
* @return string A simple content type name, i.e. `'html'`, `'xml'`, `'json'`, etc., depending
View
@@ -19,7 +19,7 @@
* (using `Connections::add()`), it is most typical to define all connections at once, in
* `config/bootstrap/connections.php`.
*
- * THe `Connections` class handles adapter classes efficiently by only loading adapter classes and
+ * The `Connections` class handles adapter classes efficiently by only loading adapter classes and
* creating instances when they are requested (using `Connections::get()`).
*
* Adapters are usually subclasses of `lithium\data\Source`.
View
@@ -182,7 +182,7 @@ public function digest() {
$keys = implode('|', array_keys($params));
$regex = '@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@';
preg_match_all($regex, $header, $matches, PREG_SET_ORDER);
- $result = array();
+ $results = array();
foreach ($matches as $m) {
$results[$m[1]] = $m[3] ? $m[3] : $m[4];
View
@@ -103,7 +103,7 @@ public static function connect($template, $params = array(), $options = array())
/**
* Wrapper method which takes a `Request` object, parses it through all attached `Route`
- * objects, and assigns the resulting parameters to the `Request` object, and returning it.
+ * objects, assigns the resulting parameters to the `Request` object, and returns it.
*
* @param object $request A request object, usually an instance of `lithium\action\Request`.
* @return object Returns a copy of the `Request` object with parameters applied.

0 comments on commit 7efcd55

Please sign in to comment.