Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…5256
zendframework · Nov 18, 2013 · 24907b1 · 24907b1
commit 24907b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -443,7 +443,7 @@ protected function _getNextToken()
      * Solar Framework by Paul M. Jones
      *
      * @link   http://solarphp.com/
-     * @link   http://svn.solarphp.com/core/trunk/Solar/Json.php
+     * @link   https://github.com/solarphp/core/blob/master/Solar/Json.php
      * @param  string $chrs
      * @return string
      */

diff --git a/src/Encoder.php b/src/Encoder.php
@@ -436,7 +436,7 @@ public static function encodeClasses(array $classNames, $package = '')
      * Solar Framework by Paul M. Jones
      *
      * @link   http://solarphp.com/
-     * @link   http://svn.solarphp.com/core/trunk/Solar/JSON.php
+     * @link   https://github.com/solarphp/core/blob/master/Solar/Json.php
      * @param  string $value
      * @return string
      */

diff --git a/src/Server/Client.php b/src/Server/Client.php
@@ -144,7 +144,7 @@ public function doRequest($request)
 
         $this->lastResponse = $response;
 
-        // import all response data form JSON HTTP response
+        // import all response data from JSON HTTP response
         $response->loadJson($httpResponse->getBody());
 
         return $response;