Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Jul 12, 2012
2 parents 66a7225 + e1fdc01 commit cfdd1ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/JsonTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ public function toJSON()

/**
* Serializable class exposing a toArray() method
* @see ZF-11167
* @group ZF-11167
*/
class ZF11167_ToArrayClass
{
Expand All @@ -981,7 +981,7 @@ public function toArray()

/**
* Serializable class exposing both toArray() and toJson() methods
* @see ZF-11167
* @group ZF-11167
*/
class ZF11167_ToArrayToJsonClass extends ZF11167_ToArrayClass
{
Expand Down
2 changes: 0 additions & 2 deletions test/Server/ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
use Zend\Json\Server\Response;

/**
* Test case for Zend\Json\Server\Client
*
* @category Zend
* @package Zend_Json
* @subpackage UnitTests
Expand Down

0 comments on commit cfdd1ce

Please sign in to comment.